Commit Graph
972 Commits
Author SHA1 Message Date
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 c568a3d258 Merge pull request #125 from G4me4u/master
Added a way to ensure tickrate compatibility with other mods.
2020-01-02 19:45:32 -04:00
gnembon f15ecd1dd2 better smooths WIP 2020-01-02 17:30:19 -04:00
G4me4u 08539da5cc Renamed establishTickrateLink to addTickrateListener 2020-01-02 22:23:54 +01:00
G4me4u 490db4f5d6 Added a way to ensure tickrate compatibility with other mods 2020-01-02 21:49:13 +01: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