Commit Graph
174 Commits
Author SHA1 Message Date
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon 193b7a3e3a Merge branch 'master' into 1.15 2019-11-21 00:13:44 -04:00
gnembon 848f95cd30 new snapshot ETA 2019-11-21 00:13:20 -04:00
gnembon dbf48ea3bf Merge branch 'master' into 1.15 2019-11-20 01:23:59 -04:00
gnembon 18edddcade 1.2.4 2019-11-20 01:18:32 -04:00
gnembon 12408cac75 Merge branch 'master' into 1.15 2019-11-18 01:17:37 -04:00
gnembon 95b85928f9 refactored and reworked functions in scarpet 2019-11-18 00:56:50 -04:00
gnembon 57d1546fb3 Merge branch 'master' into 1.15 2019-11-14 23:21:45 -04:00
gnembon 3feb7bffbb midversion to support fixed profiler 2019-11-14 23:19:21 -04:00
gnembon 29fa86ca8a Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-13 14:03:52 -04:00
gnembon 12e6ef627f 1.2.3 2019-11-13 14:01:29 -04:00
gnembon 4cc0412fe2 Merge branch 'master' into 1.15 2019-11-08 04:07:28 -04:00
gnembon 223c5059be v191108 2019-11-08 02:50:03 -04:00
gnembon 336b1070a3 disable kelpGenerationGrowthlimit because its fixes the same way in core 2019-11-08 02:46:51 -04:00
gnembon 6dd31329b7 Merge branch 'master' into 1.15 2019-11-07 14:29:26 -04:00
gnembon c855955179 1.2.2 2019-11-07 14:27:25 -04: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 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