Commit Graph
1482 Commits
Author SHA1 Message Date
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 729399870e Merge branch 'master' into 1.15 2019-11-18 22:07:42 -04:00
gnembon bd61340e46 events are added on the fly as source loads 2019-11-18 16:06:35 -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 829e0a7df5 Merge branch 'master' into 1.15 2019-11-08 22:47:29 -04:00
gnembon 6aa358c5fc calling block for a block future will resolve it. 2019-11-08 22:47:18 -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 ecf3f24c28 function definition now borrows variables from the defined context, not used context - so much more useful. 2019-11-04 01:16:24 -04:00
gnembon efb87c8497 added copy and fixed cleaning of semicolons 2019-11-04 00:35:32 -04:00
gnembon 4f200671cf Merge branch 'master' into 1.15 2019-10-30 01:54:58 -03:00
gnembon 1706fd41a8 handle no arguments in modify 2019-10-30 01:54:21 -03:00
gnembon 0c5fd2f45c Merge branch 'master' into 1.15 2019-10-30 01:46:04 -03:00
gnembon c9715c89ae added noclip option for entities 2019-10-30 01:45:35 -03: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 b1e2b4367d Merge branch 'master' into 1.15 2019-10-28 21:55:49 -03:00
gnembon 9315bc09dd simplified string parsing. 2019-10-28 21:55:27 -03:00
gnembon 98036e51a6 should technically be little faster 2019-10-25 23:06:51 -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 4701fb5067 Merge branch 'master' into 1.15 2019-10-24 08:41:45 -03:00
gnembon 51a95a241c added lambda support 2019-10-24 08:41:20 -03:00
gnembon 810499f5d0 HUGE change 2019-10-24 08:10:08 -03:00
gnembon a3715f08a4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-24 00:53:40 -03:00
gnembon 19781b2a4d never star imports 2019-10-24 00:49:25 -03:00
gnembon 835f63755d -> now returns function name. 2019-10-24 00:20:29 -03:00
gnembon 7f941e02f5 fixed position tracking 2019-10-23 14:02:04 -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 7178f5940a Merge branch 'master' into 1.15 2019-10-22 20:31:18 -03:00
gnembon b90da71359 ensure saving proper data 2019-10-22 20:29:34 -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