Commit Graph
475 Commits
Author SHA1 Message Date
gnembon fc2c738f9e Merge branch 'master' into 1.15 2020-01-14 01:27:26 -04:00
gnembon cfc71b845d system key-value storage 2020-01-14 01:26:46 -04:00
gnembon 1c3d08b813 system key-value storage 2020-01-14 01:20:20 -04:00
gnembon 335b82aafb Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-01-14 01:19:24 -04:00
gnembon 1bf1dd254f docs 2020-01-13 23:08:08 -04:00
gnembon 787cf750b5 structures API call 1.15 2020-01-13 08:34:32 -04:00
gnembon 6a6c8ac597 structures API call 1.15 2020-01-12 22:19:31 -04:00
gnembon f2427c6c07 Merge branch 'master' into 1.15 2020-01-12 22:14:18 -04:00
gnembon 2b0a370996 structures API call 2020-01-12 22:14:05 -04:00
gnembon 1ea8815bd0 Merge branch 'master' into 1.15 2020-01-10 21:50:20 -04:00
gnembon f8c8296f29 added breeding age, so there is no need to messup with data command for that. 2020-01-10 21:50:03 -04:00
gnembon e351429bdb Merge branch 'master' into 1.15 2020-01-10 17:42:45 -04:00
gnembon f43fb092b2 docs 2020-01-10 17:42:30 -04:00
gnembon 59bf0c5b18 Merge branch 'master' into 1.15 2020-01-10 17:32:35 -04:00
gnembon 953dd1c2a5 import reports imports 2020-01-10 17:31:26 -04:00
gnembon 671cad22bb Merge branch 'master' into 1.15 2020-01-10 11:32:16 -04:00
gnembon a841755d61 enderchest API support 2020-01-10 11:31:49 -04:00
gnembon cc4096ea3f fixes to imports, and fix to #56 and #59 in gnembon/scarpet 2020-01-10 01:09:39 -04:00
gnembon d82ec46d30 Merge branch 'master' into 1.15 2020-01-09 00:54:10 -04:00
gnembon 9214c31352 added libraries 2020-01-09 00:53:36 -04:00
gnembon 01273548b2 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
2020-01-09 00:10:04 -04:00
gnembon f674936199 renamed main 2020-01-08 23:47:54 -04:00
gnembon 4f65be946c modules and imports 2020-01-08 23:38:31 -04:00
gnembon 34bf877bc7 removed unneded reference 2020-01-07 00:04:44 -04:00
gnembon f8dc860d39 Merge branch 'master' into 1.15 2020-01-06 23:49:56 -04:00
gnembon f76afb5b2c allowed newlines in strings and error other special chars not handled by mc itself. 2020-01-06 23:49:01 -04:00
gnembon c995716357 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
2020-01-06 21:28:07 -04:00
gnembon 6ac249968a remove a few warnings 2020-01-06 21:26:44 -04:00
gnembon 9302a45510 Merge branch 'master' into 1.15 2020-01-05 17:12:03 -04:00
gnembon 9b004c106c docs 2020-01-05 17:10:58 -04:00
gnembon 8725b59241 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
2020-01-05 02:27:33 -04:00
gnembon 1650f3233b imports and better error reporting and stacktraces 2020-01-05 02:24:48 -04:00
gnembon e069e1485d Merge branch 'master' into 1.15 2019-12-28 16:10:01 -04:00
gnembon 8d17abfbe8 prevent from missing keys causing NPE 2019-12-28 16:09:32 -04:00
gnembon e9e36f64a3 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/resources/carpet.mixins.json
2019-12-27 11:26:49 -04:00
gnembon 4f52a04d84 docs 2019-12-27 11:23:57 -04:00
gnembon d7ca974f1a statistics, block placed and interacted events, stats event test 2019-12-27 03:25:56 -04:00
gnembon d37c9075b8 Merge branch 'master' into 1.15 2019-12-25 22:00:32 -04:00
gnembon 733a09d14b optimized particle lines 2019-12-25 22:00:07 -04:00
gnembon 0b296cc05c update threads to 1.15.1 2019-12-25 03:33:25 -04:00
gnembon b09982e02c merge errors 2019-12-25 03:19:57 -04:00
gnembon 3e6f83905c Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2019-12-25 03:18:15 -04:00
gnembon ce744802cf cleanup 2019-12-25 03:10:32 -04:00
gnembon a4e6e7cb10 camera update and task clearing 2019-12-25 02:44:14 -04:00
gnembon 62529a352c camera update 2019-12-22 02:26:40 -04:00
gnembon 8c95aab2c6 scarpet thread safe pt1 2019-12-19 18:11:13 -04:00
gnembon 0e9566a58d removed set_async as pointless 2019-12-19 01:48:33 -04:00
gnembon ab3334e452 Merge branch 'threads' of https://github.com/gnembon/fabric-carpet into threads 2019-12-18 10:41:21 -04:00
gnembon 9457ce741c fixed te fillUpdates and client call fix. better camera 2019-12-18 10:41:03 -04:00
gnembon 2ff7988251 resolved joins from main thread as illegal 2019-12-17 14:41:47 -04:00