Commit Graph
649 Commits
Author SHA1 Message Date
gnembon 9457ce741c fixed te fillUpdates and client call fix. better camera 2019-12-18 10:41:03 -04:00
gnembon 423701d4d7 Revert "threading testing"
This reverts commit 9ba573af
2019-12-17 11:58:35 -04:00
gnembon 9ba573afe6 threading testing 2019-12-17 10:28:14 -04:00
gnembon 7bfc2d394c Merge branch 'master' into 1.15 2019-12-13 01:28:14 -04:00
gnembon 04cd9ce93e should that fix mapping issues? 2019-12-13 01:25:08 -04:00
gnembon ada89c1f7e fixed 1.15 positioning 2019-12-13 02:50:11 -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 2d8ecb1341 Merge branch 'master' into 1.15 2019-12-11 00:59:37 -04:00
gnembon 98289b92fd carpet is not the only fabric mod in the world 2019-12-11 00:57:31 -04:00
gnembon c0d9b6ecb6 Merge branch 'master' into 1.15 2019-12-11 00:31:58 -04:00
gnembon f9b51ef141 extremeBehaviours 2019-12-11 00:30:46 -04:00
gnembon d279696c18 1.15 2019-12-11 00:04:38 -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 04459094e6 1.15 mixin cleanup 2019-12-07 01:07:19 -04:00
gnembon 56ea9ac961 cleaning up fixed 1.15 features 2019-12-06 16:49:50 -04:00
gnembon d764543f51 1.15-pre5-2 2019-12-05 21:45:14 -04:00
gnembon bd5bd12e2a Merge branch 'master' into 1.15 2019-11-29 10:34:36 -04:00
gnembon afd7952a62 refactor entity events. Allow multiple hosts have events on things 2019-11-29 10:34:13 -04:00
gnembon 1d10f7f1b1 1.15 pre3 2019-11-28 19:54:15 -04:00
gnembon 6497200dac 1.15 pre2 - 4 2019-11-28 11:43:55 -04:00
gnembon e4520a0a11 1.15 change 2019-11-26 02:15:42 -04:00
gnembon 6e97401ebb Merge branch 'master' into 1.15 2019-11-26 02:07:25 -04:00
gnembon 8b73d57a6b chunk_tickets_api 2019-11-26 02:05:48 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -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 12408cac75 Merge branch 'master' into 1.15 2019-11-18 01:17:37 -04:00
gnembon 95b85928f9 refactored and reworked functions in scarpet 2019-11-18 00:56:50 -04:00
gnembon 1861381951 oupsie 2019-11-10 20:49:31 -04:00
gnembon 0021aa4a20 19w45b 2019-11-09 23:51:53 -04:00
gnembon d212fcb03d Merge branch 'master' into 1.15 2019-11-09 23:19:00 -04:00
gnembon f61976f039 ctrlQ crafting will not craft other items if items not match up. 2019-11-09 23:18:19 -04:00
DeadlyMC 16f232e30d Port the ctrlQCrafting change from carpet112 by @X-com 2019-11-09 21:55:54 +05:30
gnembon 336b1070a3 disable kelpGenerationGrowthlimit because its fixes the same way in core 2019-11-08 02:46:51 -04:00
gnembon ec19e37a74 19w45a 2019-11-07 16:13:15 -04:00
gnembon 24d4159f9f Merge branch 'dummy_enchants' into 1.15 2019-11-07 07:58:32 -04:00
gnembon ff8dc630c5 19w44a 2019-10-30 13:38:51 -03:00
gnembon fa3b119857 Merge branch 'master' into 1.15 2019-10-30 01:24:20 -03:00
gnembon 5bb959a853 falling blocks can also tick 2019-10-30 01:23:52 -03:00
gnembon f41ae0f00e Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/TntEntityMixin.java
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-23 08:58:57 -03:00
gnembon 1226a940e9 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-10-23 08:50:03 -03:00
gnembon e21cbf5f59 remove markers when app unloads or not loaded 2019-10-23 08:49:58 -03:00
Joe 644203bf6c Surely the JVM should have caught this? 2019-10-23 04:57:51 +01:00
Joe df2ea4d2cc Add TNT rules 2019-10-23 04:53:34 +01:00
gnembon 2d7bfb25b3 renamed mixin trying to prevent colliding in the future 2019-10-22 20:31:52 -03:00
gnembon d008c38238 fixes to piston movement 2019-10-16 16:21:35 -03:00