Commit Graph

6080 Commits

Author SHA1 Message Date
MattBDev
51a5c22677 I hope these are the last few errors 2019-10-03 20:37:19 -04:00
MattBDev
3ed9bdc7c9 I hope these are the last few errors 2019-10-03 20:27:19 -04:00
MattBDev
f963e63f58 Attempt to fix compiling 2019-10-03 19:35:55 -04:00
Kenzie Togami
d8d25fbff1
Merge pull request #517 from EngineHub/feature/watchdog-ticking
Tick the watchdog on world actions
2019-09-30 15:39:31 -07:00
wizjany
91f92a46fe Apply watchdog mode to undo/redo. Abstract EditSession creation logic. 2019-09-30 18:28:13 -04:00
Kenzie Togami
3093c45675
Restore mixin generic 2019-09-30 14:59:51 -07:00
Kenzie Togami
a273e27eda
Properly use mixins to implement Watchdog 2019-09-30 14:58:11 -07:00
wizjany
da0ef12239 Add Bukkit watchdog implementation. 2019-09-30 16:47:24 -04:00
Kenzie Togami
7e3fc6c8e7
Disable watchdog ticking by default, //watchdog to turn on 2019-09-29 22:10:04 -07:00
Kenzie Togami
8af68fc884
Initial watchdog setup. Bukkit needs adapters, everything needs testing. 2019-09-29 22:09:55 -07:00
wizjany
a515ed0a30
Merge pull request #522 from EngineHub/feat/nested-fabric-api
Bundle required fabric api jars.
2019-09-28 19:58:52 -04:00
wizjany
7f4166157e
Merge branch 'master' into feat/nested-fabric-api 2019-09-28 19:43:06 -04:00
Kenzie Togami
fa25ad22cd
Harden JsonFileSessionStore against nulls/Gson oddities 2019-09-23 11:46:24 -07:00
Kenzie Togami
982caaffab
Trigger test for hooks 2019-09-22 17:08:16 -07:00
Kenzie Togami
bb8c150ed3
Update ForgeGradle + Gradle 2019-09-22 14:12:34 -07:00
Kenzie Togami
445b7706fc
Restructure how Loom is included in build env 2019-09-22 13:42:26 -07:00
Kenzie Togami
1832d08d92
Merge pull request #520 from EngineHub/feature/tool-command
Add /tool back, deprecate global tool commands
2019-09-22 13:27:43 -07:00
Kenzie Togami
6162a47002
Force non-Locatable actors to use placeAtPos1 2019-09-21 18:21:22 -07:00
MattBDev
e5c1d9e6cf Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-21 21:21:15 -04:00
MattBDev
94e4fb089a Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:20:59 -04:00
MattBDev
1e08e9678e Attempt to fix dependency resolution with PlotSquared 2019-09-21 21:14:36 -04:00
MattBDev
24a147465d Fixed a bunch of extends and removed slottableblockbag 2019-09-21 21:00:45 -04:00
MattBDev
8b96cdc9a5 *
A tribute to Jesse
2019-09-20 21:52:35 -04:00
wizjany
e77393a51e Bundle required fabric api jars. 2019-09-19 21:21:25 -04:00
wizjany
44dc926c49 Fix console command usage. 2019-09-19 20:53:47 -04:00
MattBDev
68c8fca672 Fixed PlotSquared compiling issues 2019-09-19 16:43:21 -04:00
MattBDev
c926cddbd6 Item Registry Test is now functional 2019-09-19 14:56:03 -04:00
MattBDev
16e24a2400 Created an Item Registry Test (non-functional) 2019-09-19 11:30:22 -04:00
MattBDev
3bcfcd3008 Fixed bug with wands and updated tests 2019-09-18 15:09:04 -04:00
MattBDev
4357c4b049 Fixed not being able to login. 2019-09-15 12:50:37 -04:00
Kenzie Togami
23ca70e49a
[Forge] Update to Recommended Forge, newer mappings 2019-09-14 01:06:49 -07:00
MattBDev
6cff848598 Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-13 23:19:46 -04:00
MattBDev
0bddb565ab Fixed compile issue 2019-09-13 23:19:28 -04:00
MattBDev
d415f79e4b Fixed compile issue 2019-09-13 23:17:40 -04:00
MattBDev
e72f1b32df I hate when md_5 actually decides to do stuff. 2019-09-13 23:12:49 -04:00
MattBDev
8ce644b737 Merge remote-tracking branch 'origin/commanding' into commanding 2019-09-13 23:07:12 -04:00
MattBDev
14ed3f1d9c Remove FawePlayer and API modifications 2019-09-13 23:05:16 -04:00
NotMyFault
714f8583f3 Update gradle 2019-09-14 01:54:39 +02:00
Kenzie Togami
ba26d788af
Add /brush none and unbind aliases 2019-09-09 18:13:57 -07:00
Kenzie Togami
0e9fee3b60
Add /tool back, deprecate global tool commands 2019-09-08 17:46:29 -07:00
Kenzie Togami
fa364dd738
[Forge] Update FG + Forge 2019-09-07 21:59:13 -07:00
MattBDev
c65e06cb1b Removed tool command 2019-09-03 15:40:59 -04:00
MattBDev
2548b955ac Remove immutable list from brushes to prevent possible startup issue. 2019-09-03 15:33:07 -04:00
MattBDev
cafb4120ef More upstream compatibility fixes 2019-09-03 15:21:53 -04:00
MattBDev
e88adea066 Added WorldConverter.java 2019-09-03 12:35:22 -04:00
MattBDev
ae2d765533 Removed duplicated method and implemented missing ones 2019-09-03 12:17:21 -04:00
MattBDev
c03015adc8 Temporarily removed the world command
Issues need to be worked out and investigated.
2019-09-02 15:41:43 -04:00
MattBDev
46550a076f Possible compile fix 2019-09-02 15:37:01 -04:00
MattBDev
06a92d29b1 Merge branch 'commanding' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into commanding
# Conflicts:
#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java
#	worldedit-libs/core/build.gradle.kts
2019-09-02 15:24:53 -04:00
MattBDev
c20f4c6b7f Fixed a null pointer. Merged in a bunch of CLI stuff. 2019-09-02 15:22:43 -04:00