Commit Graph
12 Commits
Author SHA1 Message Date
gnembon 3ec5c209fd mappings 2020-07-27 01:44:42 -03:00
gnembon 4fe6a8d80f 20w30a 2020-07-22 17:15:26 -03:00
gnembon f9eaecf150 1.16-rc1 2020-06-21 22:52:05 -03:00
gnembon 243c3290ae mappings 2020-05-27 00:46:44 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03: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 2e1cfdda5d Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-20 01:03:04 -04:00
gnembon 7ef2f9c8ca new loader 2019-11-20 00:59:49 -04:00
gnembon 34aaa2e46c fixed coral crash 2019-09-22 20:37:03 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon b257e6f984 other features 2019-05-22 15:21:07 -03:00