Commit Graph
3498 Commits
Author SHA1 Message Date
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 4549c9948c Merge pull request #92 from DeadlyMC/patch-1
Add flatWorldStructureSpawning to feature list
2019-10-15 12:37:08 -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
DeadlyMC 9b1f355d1e add flatWorldStructureSpawning to feature list 2019-10-13 12:36:12 +05:30
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 2e7e98669f Merge pull request #90 from DeadlyMC/flatworlds
Flat worlds structure spawning
2019-10-11 12:51:50 -03:00
DeadlyMC a8936c9efe added nether and end mobs 2019-10-11 20:31:02 +05:30
DeadlyMC 0957bb9b0c forgot to add desert temple spawns 2019-10-11 20:19:36 +05:30
gnembon a84b06306a . operator as lvalue 2019-10-11 11:11:54 -03:00
DeadlyMC 8ec1288079 flatWorldStructureSpawning 2019-10-11 18:28:37 +05:30
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