Commit Graph
170 Commits
Author SHA1 Message Date
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
gnembon bf22134640 Merge branch 'master' into 1.15 2019-09-14 23:13:32 -03:00
gnembon 741434dbab pretties mob names 2019-09-14 23:05:41 -03:00
gnembon 7e2a001be5 sending command trees are deferred to the end of the tick. 2019-09-14 20:08:49 -03:00
gnembon 256d54fab7 removed all mentions of a tile per official Micro$oft corporate mappings 2019-09-13 17:00:14 -03:00
gnembon 2fcef289f0 Merge branch 'master' into 1.15 2019-09-04 22:06:05 -03:00
gnembon 06b3f7c532 more entity events and entity item api 2019-09-03 09:16:18 -03:00
gnembon 628a350ea1 19w35a 2019-08-28 20:23:32 -03:00
gnembon 8a01ebea41 profiler remembers requestee, and better rounding in scarpet 2019-08-23 06:04:13 +02:00
gnembon 2e3cb4f7c9 ghost blocks fix 2019-07-28 12:32:11 -03:00
gnembon e021ca39b2 added breeding tracking 2019-07-28 09:01:30 -03:00
gnembon 3c96345a60 tracking and tracing 2019-07-20 18:53:17 -03:00
gnembon dc0dc9e406 update for extensions 2019-07-16 00:15:11 -03:00
gnembon b3fc8de75b messenger careful not to crash on worlds half loaded 2019-07-15 23:35:34 -03:00
gnembon 0048b666b4 light blocking 2019-06-27 09:13:45 -03:00
gnembon bbe191f9d9 fixed spawn tracking after 1.14.3 pre 2 2019-06-14 08:29:53 -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 5faa8754fb 1.14.3 pre 1 2019-06-03 22:37:12 -03:00
gnembon b331f82adb vanilla cat spawning bug 2019-05-24 13:25:57 -03:00