Commit Graph
713 Commits
Author SHA1 Message Date
gnembon 97379814af fix stackable sboxes 2020-02-11 00:33:05 -04:00
gnembon 9b7c65813a set_biome now works in fully 3D - fill entire column of biome to have old typical behaviour 2020-02-10 14:36:36 -04:00
gnembon 8558bb1523 set_biome now works in fully 3D - fill entire column of biome to have old typical behaviour 2020-02-10 14:36:12 -04:00
gnembon 8c6db7bc6f Merge branch 'master' into 1.16 2020-02-10 02:06:33 -04:00
gnembon fe2f91f84c unnecessary shadows 2020-02-10 02:06:21 -04:00
gnembon 9035dd08c6 Merge branch 'master' into 1.16 2020-02-10 01:53:03 -04:00
gnembon ee4a073a57 added ability set unmountable entities 2020-02-10 01:52:08 -04:00
gnembon 8a09fb55b2 Merge branch 'master' into 1.16 2020-02-09 01:57:58 -04:00
gnembon dffaec7355 raneming 2020-02-08 18:21:18 -04:00
gnembon 13a8fbb6f2 Merge pull request #142 from ImUrX/betterNetherDelays
make the nether portal delays better, fixes #139
2020-02-08 18:12:57 -04:00
ImUrX a44b4439bc in both sides... 2020-02-08 16:51:56 -03:00
ImUrX d13ae34b1e forgot about invulnerable 2020-02-08 16:50:55 -03:00
ImUrX a83088e685 use injections 2020-02-08 16:49:39 -03:00
gnembon 2f517f93eb Merge branch 'master' into 1.16 2020-02-08 15:20:35 -04:00
gnembon 148a3a0676 resurrecting elders, fixes #141 2020-02-08 15:19:27 -04:00
ImUrX fe56ab8d3e overwrite getMaxNetherPortalTime 2020-02-08 16:18:56 -03:00
gnembon 4780514cb2 20w06a -3 mapping 2020-02-05 20:41:15 -04:00
gnembon 7f09bbf193 a note 2020-02-06 00:13:52 -04:00
gnembon 536b88e61f Merge branch 'master' into 1.16 2020-02-05 20:15:35 -04:00
gnembon 9fa0e6109b 20w06a 2020-02-05 13:56:51 -04:00
gnembon fbd917b005 1.15.2-11 2020-02-03 12:06:40 -04:00
gnembon c5afe202f7 mappin updates 2020-01-28 12:26:53 -04:00
gnembon 00a540505e Merge branch 'master' into 1.15 2020-01-28 12:23:11 -04:00
gnembon 4bf27c3d15 interactionUpdates 2020-01-28 12:22:51 -04:00
gnembon bd637d5d6b mapping 2020-01-27 23:30:31 -04:00
gnembon e94dd23402 Merge branch 'master' into 1.15 2020-01-27 14:50:11 -04:00
gnembon 6c1d3dd5f6 fix defaults on hardcodeTNTangle 2020-01-27 14:48:56 -04:00
gnembon 69ce425ecd mappping 2020-01-21 12:00:43 -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 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 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -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 c054400301 hidden mapping changes 2020-01-14 19:41:10 -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 671cad22bb Merge branch 'master' into 1.15 2020-01-10 11:32:16 -04:00
gnembon 80b72366ee attempt to fix #129 2020-01-10 01:21:14 -04:00
gnembon c75ee6b385 update yarn 2020-01-09 00:23:20 -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 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