Commit Graph
16 Commits
Author SHA1 Message Date
gnembon ae0975d626 mappings 2020-05-10 01:42:19 -03:00
gnembon 130ef80d30 mappings back to normal 2020-03-20 01:47:18 -03:00
gnembon 93806466a8 20w12a 2020-03-18 18:56:41 -03:00
gnembon f7a2b8202b boi, 20w10a 2020-03-04 17:43:26 -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 431080eea9 Merge branch 'master' into 1.15 2019-12-01 01:05:27 -04:00
gnembon b52b5c335f ops options for commands 2019-12-01 01:04:58 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon 1195b95d0d 19w39a 2019-09-27 16:35:41 -05:00
gnembon 4b55b1465d 19w39a first fixes 2019-09-27 12:37:27 -05: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 f3da8b2576 updated to 1.14.3 pre 2, still issues with fabric spawn tracking mappings 2019-06-07 11:51:11 -03:00
gnembon 49118ce503 unbroke 2019-05-11 11:20:56 -03:00
gnembon a28f7be625 megabroke 2019-05-11 05:01:26 -03:00