 gnembon
|
d279696c18
|
1.15
|
2019-12-11 00:04:38 -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
|
380b9131d8
|
added bee tree
|
2019-12-07 01:06:08 -04:00 |
|
|
gnembon
|
511919ae1b
|
trying the beehive feature
|
2019-12-06 16:22:29 -04:00 |
|
|
gnembon
|
9df699746c
|
fixed plop 1.15 changes
|
2019-12-06 15:47:13 -04:00 |
|
|
gnembon
|
6497200dac
|
1.15 pre2 - 4
|
2019-11-28 11:43:55 -04:00 |
|
|
gnembon
|
a463b10bca
|
1.15 pre1 - 7
|
2019-11-25 15:17:44 -04:00 |
|
|
gnembon
|
3b6c1d045e
|
seems to be working fine, but trees and other decorations received massive bureaucratic payload
|
2019-10-10 01:46:44 -03:00 |
|
|
gnembon
|
7b649f9ccd
|
19w41a first pass
|
2019-10-09 19:43:37 -03:00 |
|
|
gnembon
|
addb836b21
|
19w36a
|
2019-09-05 09:09:46 -03:00 |
|
|
gnembon
|
628a350ea1
|
19w35a
|
2019-08-28 20:23:32 -03:00 |
|
|
gnembon
|
734dc95dab
|
settings ported to the annotation based system
|
2019-06-11 23:01:09 -03:00 |
|
|
gnembon
|
b5454a8285
|
added pillager outposts
|
2019-06-03 08:55:49 -03:00 |
|
|
gnembon
|
57e17df632
|
plop village
|
2019-05-24 11:49:13 -03:00 |
|
|
gnembon
|
e3c0edae3c
|
plop
|
2019-05-23 15:59:43 -03:00 |
|