Merge remote-tracking branch 'origin/master' into 1.16.x

This commit is contained in:
Hubry committed 2020-06-29 15:17:05 +02:00
commit 73630f11e1
3 files changed
+16 -6

No files matched your search

@@ -21,14 +21,19 @@
"source": "block_entity",
"ops": [
{
"source": "lastFood",
"target": "BlockEntityTag.lastFood",
"source": "lastFoods",
"target": "BlockEntityTag.lastFoods",
"op": "replace"
},
{
"source": "lastFoodCount",
"target": "BlockEntityTag.lastFoodCount",
"op": "replace"
},
{
"source": "streakLength",
"target": "BlockEntityTag.streakLength",
"op": "replace"
}
]
}
@@ -21,14 +21,19 @@
"source": "block_entity",
"ops": [
{
"source": "lastFood",
"target": "BlockEntityTag.lastFood",
"source": "lastFoods",
"target": "BlockEntityTag.lastFoods",
"op": "replace"
},
{
"source": "lastFoodCount",
"target": "BlockEntityTag.lastFoodCount",
"op": "replace"
},
{
"source": "streakLength",
"target": "BlockEntityTag.streakLength",
"op": "replace"
}
]
}
@@ -121,8 +121,8 @@ public class ModSubtiles {
public static final Block hopperhock = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock::new);
public static final Block hopperhockChibi = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new);
public static final Block hopperhockFloating = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock::new);
public static final Block hopperhockChibiFloating = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new);
public static final Block hopperhockFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock::new);
public static final Block hopperhockChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new);
public static final Block tangleberrie = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileTangleberrie::new);
public static final Block tangleberrieFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileTangleberrie::new);