Commit Graph
235 Commits
Author SHA1 Message Date
gnembon a4e6e7cb10 camera update and task clearing 2019-12-25 02:44:14 -04:00
gnembon 62529a352c camera update 2019-12-22 02:26:40 -04:00
gnembon 8c95aab2c6 scarpet thread safe pt1 2019-12-19 18:11:13 -04:00
gnembon 0e9566a58d removed set_async as pointless 2019-12-19 01:48:33 -04:00
gnembon 2ff7988251 resolved joins from main thread as illegal 2019-12-17 14:41:47 -04:00
gnembon 3295ca2af9 Revert "threading testing"
This reverts commit 9ba573af
2019-12-17 11:59:23 -04:00
gnembon 9ba573afe6 threading testing 2019-12-17 10:28:14 -04:00
gnembon 5d32213922 threading 2019-12-16 08:56:22 -04:00
gnembon 2d8ecb1341 Merge branch 'master' into 1.15 2019-12-11 00:59:37 -04:00
gnembon e32f915967 plopped the docs 2019-12-11 00:50:21 -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 75dea94df2 removed client function call 2019-12-03 23:15:26 -04:00
gnembon 942b41ecc4 Merge branch 'master' into 1.15 2019-12-03 23:13:30 -04:00
gnembon 20d066c674 removed client function call 2019-12-03 23:13:10 -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 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 fc9dcb6111 1.15 change 2019-11-26 02:10:01 -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 aa8f5c1921 Merge branch 'master' into 1.15 2019-11-22 00:24:08 -04:00
gnembon 24c1ee8d3d lists and maps copy by reference. use copy to get a copy. 2019-11-21 21:21:58 -04:00
gnembon f6eea46195 new loader 2019-11-20 01:16:46 -04:00
gnembon 909b183bda Merge branch 'master' into 1.15 2019-11-19 01:32:15 -04:00
gnembon 9e529fe967 Separate ScriptHost from CarpetScriptHost 2019-11-19 01:31:56 -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 831fc06e0a Merge branch 'master' into 1.15 2019-11-12 00:58:30 -04:00
gnembon 33812fc88a despawn timer for living entities 2019-11-12 00:57:58 -04:00
gnembon d212fcb03d Merge branch 'master' into 1.15 2019-11-09 23:19:00 -04:00
gnembon bcff4fbbc4 clarify laziness of blocks and added more care to context execution 2019-11-09 23:12:05 -04:00
gnembon 4cc0412fe2 Merge branch 'master' into 1.15 2019-11-08 04:07:28 -04:00
gnembon f30459bd22 fixed docs 2019-11-08 04:03:39 -04:00
gnembon ec19e37a74 19w45a 2019-11-07 16:13:15 -04:00
gnembon 4f0389fa7e 115 2019-11-07 07:59:28 -04:00
gnembon 718fb38d7d Merge branch 'master' into 1.15 2019-11-07 07:59:05 -04:00
gnembon 4997fa5a44 added optional force bool 2019-11-07 07:58:17 -04:00
gnembon 947e53d770 Merge branch 'master' into 1.15 2019-11-07 01:11:51 -04:00
gnembon ba2d654cec added generation status 2019-11-07 01:11:04 -04:00
gnembon 36e5e31d06 updated to .5 fabric 2019-10-29 01:32:39 -03:00
gnembon 125a409813 Merge branch 'master' into 1.15 2019-10-29 00:47:10 -03:00
gnembon 6c2ddd68db fixed named results, and added loaded_status 2019-10-29 00:46:44 -03:00
gnembon 23b9b4191b Merge branch 'master' into 1.15 2019-10-25 22:46:24 -03:00
gnembon f6360d3022 scarpet docs 2019-10-25 22:45:55 -03:00
gnembon f35516443b docs 2019-10-25 17:31:25 -03:00
gnembon b1cf5f4a09 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-10-25 02:14:10 -03:00