Commit Graph
344 Commits
Author SHA1 Message Date
gnembon 0acb1077a2 spawn optimizations 2020-01-28 08:45:11 -04:00
gnembon bd637d5d6b mapping 2020-01-27 23:30:31 -04:00
gnembon 797894c662 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-01-25 20:06:54 -04:00
gnembon b612be2b04 renaming a few structures for consistence 2020-01-25 20:03:44 -04:00
gnembon 0d62fdc980 added in_slime_chunk, seed, add seed option to rand 2020-01-25 11:08:11 -04:00
gnembon 51cbe4ac01 Merge branch 'master' into 1.15 2020-01-25 01:23:06 -04:00
gnembon 9914dd992c fixes to 'effect' and 'trace' 2020-01-25 01:22:09 -04:00
gnembon 9d2aa40944 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-01-21 09:47:44 -04:00
gnembon 6d41fcd372 cleanup 2020-01-21 09:45:36 -04:00
gnembon 5b2e1d1fb0 Merge branch 'master' into 1.15 2020-01-21 02:11:20 -04:00
gnembon 08089398ed tpyos 2020-01-21 02:09:34 -04:00
gnembon 0c7b3e41a5 Merge branch 'master' into 1.15 2020-01-21 02:05:11 -04:00
gnembon 16b7d569fc sometimes works 2020-01-21 02:04:47 -04:00
gnembon 81e0d733f7 merging structures to 1.15 2020-01-21 01:56:56 -04:00
gnembon 145bcf1b3c Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/helpers/FeatureGenerator.java
#	src/main/java/carpet/mixins/StructureFeatureMixin.java
2020-01-21 01:43:53 -04:00
gnembon 50d30aafb2 structure_set and unification with scarpet naming conventions 2020-01-21 01:39:23 -04:00
gnembon 6c31b48390 1.15 docs 2020-01-20 22:15:47 -04:00
gnembon d11dcc980d Merge branch 'master' into 1.15 2020-01-20 22:10:38 -04:00
gnembon 4da4f7124f mapping fixes 2020-01-20 22:10:22 -04:00
gnembon f5a5aad7a3 Merge branch '1.15' of https://github.com/gnembon/fabric-carpet into 1.15 2020-01-17 23:34:33 -04:00
gnembon 1b6643f34f Merge branch 'master' into 1.15 2020-01-17 23:34:25 -04:00
gnembon 16824c2774 added pos 2020-01-17 23:33:45 -04:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 7a62923f8b Merge branch 'master' into 1.15 2020-01-17 17:17:34 -04:00
gnembon 936fef8901 cleanup 2020-01-17 17:17:13 -04:00
gnembon c4632b9d8b POI API 2020-01-17 17:16:21 -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 c85718a2c2 initial block poi 2020-01-17 09:53:29 -04:00
gnembon 0b4405f5cd mapping update 2020-01-14 14:38:55 -04:00
gnembon 1c3d08b813 system key-value storage 2020-01-14 01:20:20 -04:00
gnembon 335b82aafb Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-01-14 01:19:24 -04:00
gnembon 1bf1dd254f docs 2020-01-13 23:08:08 -04:00
gnembon 787cf750b5 structures API call 1.15 2020-01-13 08:34:32 -04:00
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 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 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 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 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 e069e1485d Merge branch 'master' into 1.15 2019-12-28 16:10:01 -04:00