Commit Graph
270 Commits
Author SHA1 Message Date
gnembon 7c7c4733fc Merge branch 'master' into 1.15 2020-01-14 14:26:14 -04:00
gnembon a2d7d6da6a 1.3.5 version 2020-01-14 14:25:11 -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 b4482214c9 customizable forceload limit 2020-01-10 21:48:09 -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 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 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 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 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 b2a72dbcd8 WOOL 2019-12-28 17:57:52 -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 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 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 54308bb131 camera using threading 2019-12-19 01:49:00 -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 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 cf53ee72e0 Merge branch 'master' into 1.15 2019-12-12 17:22:56 -04:00
gnembon 05ac5dee2c extremeBenchmark 2019-12-12 17:22:06 -04:00
gnembon 9ef81069dc Merge branch 'master' into 1.15 2019-12-12 09:03:10 -04:00
gnembon 657acc3c6e towards 1.3.1 2019-12-12 09:02:46 -04:00
gnembon c0d9b6ecb6 Merge branch 'master' into 1.15 2019-12-11 00:31:58 -04:00
gnembon f9b51ef141 extremeBehaviours 2019-12-11 00:30:46 -04:00