mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Merge remote-tracking branch 'origin/master' into 1.16.x
This commit is contained in:
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);
|
||||
|
||||
Reference in new issue
Block a user