Commit Graph
8 Commits
Author SHA1 Message Date
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 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 f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 465eb44315 fixed tnt logging not working 2019-07-23 13:07:08 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon fef36783d6 1.14.2 pre 3 2019-05-24 12:21:53 -03:00