 X-Green
|
ec0aecf6b5
|
More infomation in TNT logging #2
|
2020-04-12 10:56:06 +08:00 |
|
|
gnembon
|
e94dd23402
|
Merge branch 'master' into 1.15
|
2020-01-27 14:50:11 -04:00 |
|
|
gnembon
|
6c1d3dd5f6
|
fix defaults on hardcodeTNTangle
|
2020-01-27 14:48:56 -04:00 |
|
|
gnembon
|
8f9dd66cdf
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
# src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
# src/main/java/carpet/mixins/FossilFeatureMixin.java
# src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
# src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
# src/main/java/carpet/mixins/KelpFeatureMixin.java
# src/main/java/carpet/mixins/MobEntity_leashMixin.java
# src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
# src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
# src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
# src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
# src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
# src/main/java/carpet/mixins/SaplingBlockMixin.java
# src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
# src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
# src/main/java/carpet/mixins/SpawnHelperMixin.java
# src/main/java/carpet/mixins/StructurePieceMixin.java
|
2019-12-10 23:14:04 -04:00 |
|
|
gnembon
|
55065a38a6
|
moved CarpetSettings up from settings manager, should be easier to find later.
|
2019-12-10 23:08:40 -04: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
|
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 |
|