Commit Graph
98 Commits
Author SHA1 Message Date
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
gnembon 7249440eda 1.15 v1.5 fix 2019-10-15 09:41:09 -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 9be03c5f10 clean imports 2019-10-13 02:56:56 -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 f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon f32a353655 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/bundled/BundledModule.java
#	src/main/resources/assets/carpet/scripts/camera.sc
#	src/main/resources/assets/carpet/scripts/event_test.sc
2019-10-11 02:28:15 -03:00
gnembon fc66ec9c93 build in script load from resources, added 2 more events, added event test 2019-10-11 02:23:45 -03:00
gnembon 435794569e build in script load from resources, fixed entity value position errors, added 2 more events, added event test 2019-10-11 01:47:04 -03:00
gnembon dee3363a0d fixed refmap issues 2019-10-10 00:27:33 -03:00
gnembon ec0be058ac 41a complete 2019-10-10 00:28:49 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -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
gnembon ef757aec1d docs contd 2019-10-08 01:52:53 -03:00
gnembon 768c44cc14 equality issues and docs 2019-10-07 09:30:25 -03:00
gnembon 2167c929d5 two more events, and nbt cleanups 2019-10-06 22:06:38 -03:00
gnembon 8b7b285503 hash code and stump of map 2019-10-01 14:50:16 -03:00
gnembon b6fe264a76 pickup delay docs 2019-10-01 10:47:25 -03:00
gnembon aac313bbb3 added . operator, changed priorities of ~ and ., cleaned entity_event handler and docs, replaced default call function to space, added stacktrace to unknown exceptions, renamed event to 'on_damaged' 2019-10-01 02:37:30 -03:00
gnembon 99af49661b added string ops and biome getter 2019-09-30 10:39:25 -03:00
gnembon 1195b95d0d 19w39a 2019-09-27 16:35:41 -05:00
gnembon 4b55b1465d 19w39a first fixes 2019-09-27 12:37:27 -05:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon bf22134640 Merge branch 'master' into 1.15 2019-09-14 23:13:32 -03:00
gnembon 27656294ec added API docs for in_dimension 2019-09-14 23:12:11 -03:00