Commit Graph
753 Commits
Author SHA1 Message Date
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 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 80b72366ee attempt to fix #129 2020-01-10 01:21:14 -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 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 15fe9c5ad9 fixes #126 2020-01-03 16:45:35 -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 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 2880924491 Merge branch 'master' into 1.15 2019-12-30 01:00:42 -04:00
gnembon 6d89763ecc final 1.3.2 2019-12-30 00:47:42 -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 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