Commit Graph
340 Commits
Author SHA1 Message Date
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 5addcc54c4 Merge branch 'master' into 1.15 2020-01-17 17:11:10 -04:00
gnembon dd31d43192 POI API 2020-01-17 17:10:22 -04:00
gnembon 0b4405f5cd mapping update 2020-01-14 14:38:55 -04:00
gnembon 7c7c4733fc Merge branch 'master' into 1.15 2020-01-14 14:26:14 -04:00
gnembon 316739c624 added synchronization and thread shutdown procedures. 2020-01-14 14:23:33 -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 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 01273548b2 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
2020-01-09 00:10:04 -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 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 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 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 d7ca974f1a statistics, block placed and interacted events, stats event test 2019-12-27 03:25:56 -04:00
gnembon 0b296cc05c update threads to 1.15.1 2019-12-25 03:33:25 -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 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 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
gnembon 3295ca2af9 Revert "threading testing"
This reverts commit 9ba573af
2019-12-17 11:59:23 -04:00
gnembon 9ba573afe6 threading testing 2019-12-17 10:28:14 -04:00
gnembon 5d32213922 threading 2019-12-16 08:56:22 -04:00
gnembon 1cf093731f extremeBenchmark 2019-12-13 18:04:47 -04:00
gnembon c4dfc1919e settled on positioning 2019-12-13 00:51:42 -04:00
gnembon de20c14da9 fixed 1.15 positioning 2019-12-12 23:32:58 -04:00
gnembon ada89c1f7e fixed 1.15 positioning 2019-12-13 02:50:11 -04:00
gnembon 25a51da4b8 relative position fail 2019-12-12 01:44:54 -04:00
gnembon 20f8c0a965 Merge branch 'master' into 1.15 2019-12-06 12:24:34 -04:00
gnembon 7f49ee09ad continue and break scarpet functions to replace _exit_ conditions in loops 2019-12-06 12:22:27 -04:00
gnembon c9160144fc Merge branch 'master' into 1.15 2019-12-01 09:39:25 -04:00
gnembon 9d6b652ad4 better block error message 2019-12-01 03:14:20 -04:00
gnembon bd5bd12e2a Merge branch 'master' into 1.15 2019-11-29 10:34:36 -04:00
gnembon afd7952a62 refactor entity events. Allow multiple hosts have events on things 2019-11-29 10:34:13 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon aa8f5c1921 Merge branch 'master' into 1.15 2019-11-22 00:24:08 -04:00
gnembon 24c1ee8d3d lists and maps copy by reference. use copy to get a copy. 2019-11-21 21:21:58 -04:00
gnembon f5ffdb6eb9 Merge branch 'master' into 1.15 2019-11-20 23:37:36 -04:00
gnembon dd2630579b built-in variables can be used in outer scopes. 2019-11-20 23:37:16 -04:00
gnembon 12408cac75 Merge branch 'master' into 1.15 2019-11-18 01:17:37 -04:00