Commit Graph
89 Commits
Author SHA1 Message Date
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 1fcd8ceffa mappings 2020-03-18 02:34:03 -03:00
gnembon 8227f8b40e Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/PerimeterDiagnostics.java
#	src/main/java/carpet/utils/SpawnReporter.java
2020-03-10 13:15:56 -03:00
gnembon 37e94e5978 weird flex but ok. Pathfinding affected spawning 2020-03-10 13:13:09 -03:00
gnembon fcd86537e6 weird flex but ok. Pathfinding affected spawning 2020-03-10 13:10:03 -03:00
gnembon 3a0a8325e1 mappings 2020-03-07 20:29:05 -04:00
gnembon f7a2b8202b boi, 20w10a 2020-03-04 17:43:26 -04:00
gnembon 6b36ac642b Merge branch 'master' into 1.16 2020-03-04 14:48:47 -04:00
gnembon fd0976de56 retiring blockpos 2020-03-04 14:48:29 -04:00
gnembon 4c5400dc38 mapping 2020-02-29 00:25:45 -04:00
gnembon 04ed78cd1e 20w09a 2020-02-26 14:09:42 -04:00
gnembon c9438aefa4 20w06a-6 2020-02-06 21:30:14 -04:00
gnembon b9bd5ec17d 20w06a features 2020-02-05 18:24:01 -04:00
gnembon fbd917b005 1.15.2-11 2020-02-03 12:06:40 -04:00
gnembon e04a8be9e8 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-02-03 10:58:17 -04:00
gnembon 230cee7815 fix materials 2020-02-02 20:16:44 -04:00
gnembon b4a50b8c3f mulitple counters in hud - not really needed but why not. 2020-02-02 00:03:38 -04:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 0b4405f5cd mapping update 2020-01-14 14:38:55 -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 c06db6eb0c WOOL 2019-12-28 16:42:45 -04:00
gnembon b54358112d WOOL 2019-12-28 16:13:47 -04:00
gnembon cf53ee72e0 Merge branch 'master' into 1.15 2019-12-12 17:22:56 -04:00
gnembon 05ac5dee2c extremeBenchmark 2019-12-12 17:22:06 -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 5005271ea3 Merge branch 'master' into 1.15 2019-12-08 13:14:55 -04:00
gnembon 1984c2cc77 fixed profiler counting be time in e time 2019-12-08 13:14:31 -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 57d1546fb3 Merge branch 'master' into 1.15 2019-11-14 23:21:45 -04:00
gnembon 5e276c6115 tighten up profiler client support 2019-11-14 23:18:07 -04:00
gnembon f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 6f156f9fc2 19w40a 2019-10-02 16:17:07 -03: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 22bf1699c8 Merge branch 'master' into 1.15 2019-09-23 08:58:09 -03:00
gnembon 826aa66cdd preventing further Messenger.m errors 2019-09-23 08:57:49 -03:00
gnembon 61306e43c1 Merge branch 'master' into 1.15 2019-09-21 16:59:45 -03:00
gnembon 130ede1602 mocking doesn't reset stats 2019-09-21 16:59:22 -03:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon 45b4bbcd99 Merge branch 'master' into 1.15 2019-09-16 00:35:36 -03:00
gnembon fb3afa3b59 black carpet finally shows mobcaps 2019-09-15 23:11:47 -03:00
gnembon 1e1b5513fa Merge branch 'master' into 1.15 2019-09-15 09:28:22 -03:00
gnembon 8d97b5bf01 leash fixes 2019-09-15 09:28:03 -03:00
gnembon 68cb8a509f moved manhattan somewhere else 2019-09-14 23:30:13 -03:00