Commit Graph
108 Commits
Author SHA1 Message Date
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 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 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 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
Joe 7527b5c2b8 Split TNTRandomRangeValidator into two validators 2019-10-23 09:57:22 +01: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 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 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 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 7fae5c92cf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-13 02:55:19 -03:00
DeadlyMC 8ec1288079 flatWorldStructureSpawning 2019-10-11 18:28:37 +05:30
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
gnembon 155c62d3fc renamed and changed block based on the final mojang proposal 2019-10-10 00:33:25 -03:00
gnembon 3e6363ae12 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
2019-10-09 21:37:27 -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 5a67d3223e Merge branch 'master' into 1.15 2019-10-09 08:58:39 -03:00
gnembon 55f6503807 just sayin 2019-10-09 08:54:08 -03:00
gnembon c9a6d2ef96 slime is honey 2 2019-10-09 08:52:52 -03:00
gnembon 3f1fd42c4e Merge branch 'master' into 1.15 2019-10-08 09:19:42 -03:00
gnembon 6f774e5727 added dev version to debug ref-map issues to be published to maven 2019-10-08 09:19:22 -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 e7103579b6 Merge branch 'master' into 1.15 2019-10-01 02:53:24 -03:00
gnembon 7c4d6c2199 fixed error when loading incorrect setting format. 2019-10-01 02:51:10 -03:00
gnembon 23c3dc58a5 Merge branch 'master' into 1.15 2019-09-27 11:16:57 -05:00
gnembon 2f83cb3100 added option to display rules from category 2019-09-27 11:00:51 -05:00
gnembon 41dbff7b15 Merge branch 'master' into 1.15 2019-09-27 08:44:47 -05:00
gnembon 7d51326144 updated date 2019-09-27 08:44:10 -05:00
gnembon 65d2208e9e loggers can now be configured to start with different default configurations. 2019-09-27 08:34:43 -05: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 22bf1699c8 Merge branch 'master' into 1.15 2019-09-23 08:58:09 -03:00
gnembon 2b632ad879 fixed message error 2019-09-23 08:33:23 -03:00
gnembon 2142b2865a Merge branch 'master' into 1.15 2019-09-22 13:39:05 -03:00
gnembon 0070e28d1a changed allowed value for rules to greedy string 2019-09-22 13:38:39 -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 be82935455 Merge branch 'master' into 1.15 2019-09-17 14:22:03 -03:00