Commit Graph
687 Commits
Author SHA1 Message Date
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 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
Joe ab6b1a8ad0 Fix ugly variable names caused by find/replace 2019-10-23 10:05:57 +01:00
Joe 7527b5c2b8 Split TNTRandomRangeValidator into two validators 2019-10-23 09:57:22 +01:00
Joe 644203bf6c Surely the JVM should have caught this? 2019-10-23 04:57:51 +01:00
Joe df2ea4d2cc Add TNT rules 2019-10-23 04:53:34 +01: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 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