Commit Graph
274 Commits
Author SHA1 Message Date
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
gnembon 22134187d8 lousy semicolon support, replace, escape, and ai in entities 2019-10-24 23:03:19 -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 e21cbf5f59 remove markers when app unloads or not loaded 2019-10-23 08:49:58 -03:00
gnembon 631545767b Merge branch 'master' into 1.15 2019-10-20 02:00:05 -03:00
gnembon d336a7b91b docs to 1.5 2019-10-20 01:07:49 -03:00
gnembon 813cb2ab93 Merge branch 'master' into 1.15 2019-10-19 22:18:14 -03:00
gnembon 0226965ba0 fixed scarpet error msgs 2019-10-19 22:17:41 -03:00
gnembon 87bb3512d4 Merge branch 'master' into 1.15 2019-10-17 10:20:07 -03:00
gnembon 2eb50c3931 safe file names 2019-10-17 01:03:53 -03:00
gnembon 8997785460 Merge branch 'master' into 1.15 2019-10-15 23:23:08 -03:00
gnembon 82dfb8266c docs 2019-10-15 13:57:34 -03:00