Commit Graph
18 Commits
Author SHA1 Message Date
gnembon 0cce983092 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/commands/PerimeterInfoCommand.java
#	src/main/resources/carpet.mixins.json
2021-04-04 22:34:38 -03:00
gnembon 51a548991d reword to properly reflect what up. fixes #761 2021-04-04 20:56:50 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 2cdea92da7 20w45a 2020-11-06 00:06:53 -04:00
gnembon 3167fe06f3 cleanup unused code and mixins 2020-08-18 01:54:24 -03:00
gnembon 7b4c3f8add Merge branch 'master' into 1.16 2020-07-21 12:45:07 -03:00
gnembon 5ed55ecf9e spawned test entity below bedrock 2020-07-21 12:44:07 -03:00
gnembon e67ec14285 mappings 2020-07-20 21:06:03 -03:00
gnembon 652ca7d6a0 spawning illegal entities with perimetercheck, fixes #194 2020-03-31 21:04:09 -03:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -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 d764543f51 1.15-pre5-2 2019-12-05 21:45:14 -04:00
gnembon b52b5c335f ops options for commands 2019-12-01 01:04:58 -04:00
gnembon cd4ae14448 1.14.4pre1 2019-07-03 16:38:12 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon b879ca2cf4 fill stuff 2019-05-18 15:08:35 -03:00
gnembon ecced620a4 moved a bunch of stuff 2019-05-12 01:48:19 -03:00