Commit Graph
100 Commits
Author SHA1 Message Date
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 892fa1e9a1 Merge branch 'master' into 1.15 2020-01-11 11:53:45 -04:00
gnembon 9011e419cb 1.3.4 2020-01-11 11:51:06 -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 e44cf0d79b action pack improvements 2020-01-10 21:48:55 -04:00
gnembon b4482214c9 customizable forceload limit 2020-01-10 21:48:09 -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 8e6b584613 Merge branch '1.15' of https://github.com/gnembon/fabric-carpet into 1.15 2020-01-10 11:33:48 -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 553e85147d Merge branch 'master' into 1.15 2020-01-10 01:22:25 -04:00
gnembon 80b72366ee attempt to fix #129 2020-01-10 01:21:14 -04:00
gnembon c8b29b0674 Merge branch 'master' into 1.15 2020-01-10 01:09:55 -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 c75ee6b385 update yarn 2020-01-09 00:23:20 -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 09500c2a9b Merge branch 'master' into 1.15 2020-01-05 17:25:25 -04:00
gnembon 3bec43fbc8 up-date 2020-01-05 17:12:55 -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 31fc93ff33 Merge branch '1.15' of https://github.com/gnembon/fabric-carpet into 1.15 2020-01-05 02:30:33 -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 56b90b8ca4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
2020-01-03 16:46:32 -04:00
gnembon 15fe9c5ad9 fixes #126 2020-01-03 16:45:35 -04:00
gnembon eee3a91890 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/resources/fabric.mod.json
2020-01-03 01:42:42 -04:00
gnembon 011240a87b compatibility with other mods, not crucial for carpetmod 2020-01-03 01:41:33 -04:00
gnembon e25d70cb51 compatibility with other mods, not crucial for carpetmod 2020-01-03 01:40:35 -04:00
gnembon 816cfc8ce9 added dep on loader 0.7.1 2020-01-03 01:05:59 -04:00
gnembon 8bcb433f72 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
#	src/main/resources/carpet.mixins.json
2020-01-03 00:16:46 -04:00
gnembon 78ea9cd6e4 1.3.3 2020-01-03 00:13:05 -04:00
gnembon f15ecd1dd2 better smooths WIP 2020-01-02 17:30:19 -04:00
gnembon eebc8d3e92 for 1.15 2020-01-02 10:41:55 -04:00
gnembon 06b90822b8 Merge branch 'master' into 1.15 2020-01-02 10:38:33 -04:00
gnembon b6632d7ec8 fix vanilla bug removing sbox counts 2020-01-02 10:38:12 -04:00
gnembon 942e1d8af5 Merge branch 'master' into 1.15 2019-12-31 09:30:58 -04:00
gnembon 78986ca2bf fix rotation problems 2019-12-31 09:30:39 -04:00
gnembon 116f7a89f8 Merge branch 'master' into 1.15 2019-12-31 08:45:16 -04:00
gnembon d30b44061d I did say transpose 2019-12-31 08:44:52 -04:00
gnembon bac2130bb4 v18 2019-12-30 01:08:42 -04:00
gnembon 2880924491 Merge branch 'master' into 1.15 2019-12-30 01:00:42 -04:00
gnembon 7a1fd2d900 eloquent help 2019-12-30 00:59:36 -04:00
gnembon 6d89763ecc final 1.3.2 2019-12-30 00:47:42 -04:00
gnembon e3f6342e86 Merge branch 'master' into 1.15 2019-12-30 00:46:52 -04:00
gnembon 977016486f added clapper 2019-12-30 00:46:33 -04:00
gnembon 59ae388ea1 Merge branch 'master' into 1.15 2019-12-29 23:01:09 -04:00
gnembon a7aed29465 transpose missing 2019-12-29 23:00:51 -04:00
gnembon 38fb74832d Merge branch 'master' into 1.15 2019-12-29 19:54:30 -04:00
gnembon 97f875cab8 added place player functionality 2019-12-29 19:54:11 -04:00
gnembon 99af29c880 Merge branch 'master' into 1.15 2019-12-29 16:05:39 -04:00
gnembon 7a608f3c36 added place player functionality 2019-12-29 16:05:25 -04:00
gnembon 43c9a8a886 Merge branch 'master' into 1.15 2019-12-28 20:41:39 -04:00
gnembon 86ce6f3505 rd dust duplication bug 2019-12-28 20:41:20 -04:00
gnembon 8022d88d28 WOOL 2019-12-28 18:00:28 -04:00
gnembon 762ddacdbd Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/resources/carpet.mixins.json
2019-12-28 17:58:13 -04:00
gnembon b2a72dbcd8 WOOL 2019-12-28 17:57:52 -04:00
gnembon 5c6232133d Merge branch 'master' into 1.15 2019-12-28 16:43:03 -04:00
gnembon c06db6eb0c WOOL 2019-12-28 16:42:45 -04:00
gnembon b54358112d WOOL 2019-12-28 16:13:47 -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 025855af42 1.15.1 build 17 2019-12-27 23:29:58 -04:00
gnembon be273d419a 1.15.1 build 17 2019-12-27 22:53:24 -04:00
gnembon bebd93f73c Merge branch 'master' into 1.15 2019-12-27 22:45:48 -04:00
gnembon 7a4f3361b2 1.3.2 2019-12-27 22:45:34 -04:00
gnembon 372b6c3c11 Merge branch 'master' into 1.15 2019-12-27 13:26:51 -04:00
gnembon f8e5a2ae22 deselect points on clearing path 2019-12-27 13:26:29 -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 860c9b6d21 adding stats test 2019-12-27 01:26:18 -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 1dc2308d2e camera threaded WIP 2019-12-20 19:02:33 -04:00
gnembon 8c95aab2c6 scarpet thread safe pt1 2019-12-19 18:11:13 -04:00
gnembon 54308bb131 camera using threading 2019-12-19 01:49:00 -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