Commit Graph
247 Commits
Author SHA1 Message Date
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 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 ccbf6d85eb Merge branch 'master' into 1.15 2019-10-25 01:09:53 -03:00
gnembon bd52f6126a hires logo 2019-10-25 00:39:15 -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 df2ea4d2cc Add TNT rules 2019-10-23 04:53:34 +01: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 bc9d0664cd restored some anti cheat things for elytra, still applicable 2019-10-16 15:48:14 -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 b99b2bd57e Merge branch 'master' into 1.15 2019-10-16 08:58:28 -03:00
gnembon e54a9ca5ca sc fix 2019-10-16 01:36:09 -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 8b531834d0 changed to ':' 2019-10-12 01:18:14 -03:00
gnembon 6a67407edf . operator as lvalue 2019-10-11 13:39:29 -03:00
DeadlyMC 8ec1288079 flatWorldStructureSpawning 2019-10-11 18:28:37 +05:30
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 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 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 ec0be058ac 41a complete 2019-10-10 00:28:49 -03:00
gnembon 5ebfb7d1c0 Merge branch 'master' into 1.15 2019-10-09 09:04:45 -03:00
gnembon 84aee6b593 1.1.2 2019-10-09 09:04:29 -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 2167c929d5 two more events, and nbt cleanups 2019-10-06 22:06:38 -03:00
gnembon 412b33fee2 Merge branch 'master' into 1.15 2019-10-02 14:29:40 -03:00
gnembon 62f4a4c113 ver 1.1.1 2019-10-02 14:29:14 -03:00
gnembon 5cc797644b Merge branch 'master' into 1.15 2019-09-25 09:51:07 -03:00
gnembon 0e2ab5d4f3 preventing further Messenger.m errors 2019-09-25 09:50:51 -03:00
gnembon f6db78c04f Merge branch 'master' into 1.15 2019-09-22 17:02:40 -03:00
gnembon 6166eb3fbf better pistons rotators 2019-09-22 17:02:21 -03:00
gnembon 0672031d29 Merge branch 'master' into 1.15 2019-09-18 20:35:01 -03:00
gnembon 322832ef5d verbump 1.0.8 2019-09-18 20:34:45 -03:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon fa8bdc800e Merge branch 'master' into 1.15 2019-09-16 22:01:38 -03:00
gnembon fd3bcab522 fix 2019-09-16 22:01:06 -03:00
gnembon 45b4bbcd99 Merge branch 'master' into 1.15 2019-09-16 00:35:36 -03:00
gnembon 368e76fbd7 fake players use items properlier 2019-09-15 17:42:31 -03:00
gnembon 5df13f46bd Merge branch 'master' into 1.15 2019-09-15 14:45:13 -03:00
DeadlyMC d985aa1059 register dispenser behaviors in DispenserBlock.getBehaviorForItem(...) 2019-09-15 21:22:50 +05:30