Commit Graph
202 Commits
Author SHA1 Message Date
gnembon 20f8c0a965 Merge branch 'master' into 1.15 2019-12-06 12:24:34 -04:00
gnembon 7f49ee09ad continue and break scarpet functions to replace _exit_ conditions in loops 2019-12-06 12:22:27 -04:00
gnembon c9160144fc Merge branch 'master' into 1.15 2019-12-01 09:39:25 -04:00
gnembon 9d6b652ad4 better block error message 2019-12-01 03:14:20 -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 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 f5ffdb6eb9 Merge branch 'master' into 1.15 2019-11-20 23:37:36 -04:00
gnembon dd2630579b built-in variables can be used in outer scopes. 2019-11-20 23:37:16 -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 947e53d770 Merge branch 'master' into 1.15 2019-11-07 01:11:51 -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 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 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 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 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 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 f32b0765e2 Merge branch 'master' into 1.15 2019-10-16 21:17:21 -03:00
gnembon 8294c79428 handled proper null value for nbt 2019-10-16 21:17:04 -03:00
gnembon 2bb9c8c145 Merge branch 'master' into 1.15 2019-10-15 09:38:35 -03:00
gnembon 6524725245 fixes to scarpet 1.5 2019-10-15 09:37:50 -03:00
gnembon 7fae5c92cf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-13 02:55:19 -03:00
gnembon 701a717135 reworked container access (never throw, multi-field access, return values, operator), added package storage 2019-10-13 02:54:18 -03:00
gnembon a84b06306a . operator as lvalue 2019-10-11 11:11:54 -03:00
gnembon f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon 2591ae99a8 fixed entity position 2019-10-11 01:54:25 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 03703fd7fe 1.15 adjustments for scarpet 1.5 2019-10-08 02:18:09 -03:00
gnembon dc9532cf05 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-08 02:07:45 -03:00