Commit Graph
100 Commits
Author SHA1 Message Date
gnembon 718fb38d7d Merge branch 'master' into 1.15 2019-11-07 07:59:05 -04:00
gnembon 24d4159f9f Merge branch 'dummy_enchants' into 1.15 2019-11-07 07:58:32 -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 ff8dc630c5 19w44a 2019-10-30 13:38:51 -03:00
gnembon 99f6b4580d Merge branch 'master' into 1.15 2019-10-30 13:24:03 -03:00
gnembon e2c614c6de ver 1.2.1 2019-10-30 13:18:41 -03: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 fa3b119857 Merge branch 'master' into 1.15 2019-10-30 01:24:20 -03:00
gnembon 5bb959a853 falling blocks can also tick 2019-10-30 01:23:52 -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 144f3a2ad8 fix stackable shulkerboxes ignoring other tags 2019-10-28 21:39:32 -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 ccbf6d85eb Merge branch 'master' into 1.15 2019-10-25 01:09:53 -03:00
gnembon b1cf5f4a09 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-10-25 02:14:10 -03:00
gnembon bd52f6126a hires logo 2019-10-25 00:39:15 -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 6733aea207 Merge branch 'master' into 1.15 2019-10-24 00:59:12 -03:00
gnembon fdc0d74ad9 inch forward dev deploy 2019-10-24 00:57:52 -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 57c21364c6 Merge branch 'master' into 1.15 2019-10-23 09:09:44 -03:00
gnembon f0bb5d2e86 fixed settings 2019-10-23 09:08:30 -03:00
gnembon a5955358bb fixes to 1.15 for tnt 2019-10-23 09:05:41 -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 1226a940e9 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-10-23 08:50:03 -03:00
gnembon e21cbf5f59 remove markers when app unloads or not loaded 2019-10-23 08:49:58 -03:00
gnembon 2d7bfb25b3 renamed mixin trying to prevent colliding in the future 2019-10-22 20:31:52 -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 fd59b826c3 1.2 2019-10-20 01:52:48 -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 3eb38afe3a Merge branch 'master' into 1.15 2019-10-18 22:31:49 -03:00
gnembon 88d2ad75ad prevent from npe when host is removed 2019-10-18 22:31:33 -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 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 d008c38238 fixes to piston movement 2019-10-16 16:21:35 -03:00
gnembon bc9d0664cd restored some anti cheat things for elytra, still applicable 2019-10-16 15:48:14 -03:00
gnembon cb900f638f 19w42a 2019-10-16 15:00:53 -03:00
gnembon 89b3cd8352 removed honeyslime, 1.1.3 2019-10-16 09:42:53 -03:00
gnembon 6018f680b4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
2019-10-16 09:40:36 -03:00
gnembon f0054564fe 1.1.3 2019-10-16 09:39:37 -03:00
gnembon 79e7bba04b restrict honey rule to 1.14 only 2019-10-16 09:38:47 -03:00
gnembon b99b2bd57e Merge branch 'master' into 1.15 2019-10-16 08:58:28 -03:00
gnembon e625734910 tabs look really badly in chat 2019-10-16 08:58:04 -03:00
gnembon e54a9ca5ca sc fix 2019-10-16 01:36:09 -03:00
gnembon 97693fef6d build5 2019-10-15 23:34:29 -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 e43c693411 fixes in 1.15 2019-10-13 03:05:27 -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 8b531834d0 changed to ':' 2019-10-12 01:18:14 -03:00
gnembon d59a4ba459 changed to ':' 2019-10-12 00:41:07 -03:00
gnembon 18a211cd5b delete accepts lvalues, still need to be more full proofed. 2019-10-11 17:06:57 -03:00
gnembon 4dca3575e7 delete accepts lvalues, still need to be more full proofed. 2019-10-11 16:07:40 -03:00
gnembon 6a67407edf . operator as lvalue 2019-10-11 13:39:29 -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 dbf8dfb3c5 Merge branch 'master' into 1.15 2019-10-11 08:19:00 -03:00
gnembon 985b179cb2 adjusted camera to v1.5 2019-10-11 08:18:40 -03:00
gnembon 01b599b8e3 adjusted camera to v1.5 2019-10-11 03:03:03 -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 ee491f87c3 Merge remote-tracking branch 'origin/1.15' into 1.15 2019-10-11 01:54:46 -03:00
gnembon 2591ae99a8 fixed entity position 2019-10-11 01:54:25 -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 3b6c1d045e seems to be working fine, but trees and other decorations received massive bureaucratic payload 2019-10-10 01:46:44 -03:00
gnembon dee3363a0d fixed refmap issues 2019-10-10 00:27:33 -03:00
gnembon 04a21f143a Merge branch 'master' into 1.15 2019-10-09 22:47:56 -03:00
gnembon 87eb46b773 fixed refmap issues 2019-10-09 22:45:41 -03:00
gnembon 49d682e858 Merge branch 'master' into 1.15 2019-10-09 21:48:48 -03:00
gnembon 50298225d8 fixed description 2019-10-09 21:46:56 -03:00