Commit Graph
18 Commits
Author SHA1 Message Date
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 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 55065a38a6 moved CarpetSettings up from settings manager, should be easier to find later. 2019-12-10 23:08:40 -04:00
gnembon 04459094e6 1.15 mixin cleanup 2019-12-07 01:07:19 -04:00
gnembon 6497200dac 1.15 pre2 - 4 2019-11-28 11:43:55 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon 3b6c1d045e seems to be working fine, but trees and other decorations received massive bureaucratic payload 2019-10-10 01:46:44 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon e613593f41 biome fixer in structure spawner should use correct biome 2019-09-06 12:58:40 -03:00
gnembon addb836b21 19w36a 2019-09-05 09:09:46 -03:00
gnembon 628a350ea1 19w35a 2019-08-28 20:23:32 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon c59ba3c10e 1.14.2 pre 4 2019-05-24 16:09:54 -03:00
gnembon 57e17df632 plop village 2019-05-24 11:49:13 -03:00
gnembon e3c0edae3c plop 2019-05-23 15:59:43 -03:00