diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index 6ac635a8b..759964d57 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -28,70 +28,70 @@ "entity.Villager.actuallyadditions.crystallizer": "Crystallizer", "entity.minecraft.villager.actuallyadditions.engineer": "Engineer", "_comment": "Banners", - "item.banner.actuallyadditionsBook.black": "Black Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.red": "Red Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.green": "Green Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.brown": "Brown Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.blue": "Blue Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.purple": "Purple Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.cyan": "Cyan Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.silver": "Silver Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.gray": "Gray Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.pink": "Pink Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.lime": "Lime Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.yellow": "Yellow Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.lightBlue": "LightBlue Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.magenta": "Magenta Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.orange": "Orange Actually Additions Manual Pattern", - "item.banner.actuallyadditionsBook.white": "White Actually Additions Manual Pattern", - "item.banner.actuallyadditionsPhanCon.black": "Black Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.red": "Red Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.green": "Green Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.brown": "Brown Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.blue": "Blue Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.purple": "Purple Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.cyan": "Cyan Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.silver": "Silver Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.gray": "Gray Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.pink": "Pink Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.lime": "Lime Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.yellow": "Yellow Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.lightBlue": "LightBlue Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.magenta": "Magenta Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.orange": "Orange Phantom Connector Pattern", - "item.banner.actuallyadditionsPhanCon.white": "White Phantom Connector Pattern", - "item.banner.actuallyadditionsLeafBlo.black": "Black Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.red": "Red Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.green": "Green Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.brown": "Brown Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.blue": "Blue Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.purple": "Purple Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.cyan": "Cyan Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.silver": "Silver Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.gray": "Gray Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.pink": "Pink Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.lime": "Lime Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.yellow": "Yellow Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.lightBlue": "LightBlue Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.magenta": "Magenta Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.orange": "Orange Leaf Blower Pattern", - "item.banner.actuallyadditionsLeafBlo.white": "White Leaf Blower Pattern", - "item.banner.actuallyadditionsDrill.black": "Black Drill Pattern", - "item.banner.actuallyadditionsDrill.red": "Red Drill Pattern", - "item.banner.actuallyadditionsDrill.green": "Green Drill Pattern", - "item.banner.actuallyadditionsDrill.brown": "Brown Drill Pattern", - "item.banner.actuallyadditionsDrill.blue": "Blue Drill Pattern", - "item.banner.actuallyadditionsDrill.purple": "Purple Drill Pattern", - "item.banner.actuallyadditionsDrill.cyan": "Cyan Drill Pattern", - "item.banner.actuallyadditionsDrill.silver": "Silver Drill Pattern", - "item.banner.actuallyadditionsDrill.gray": "Gray Drill Pattern", - "item.banner.actuallyadditionsDrill.pink": "Pink Drill Pattern", - "item.banner.actuallyadditionsDrill.lime": "Lime Drill Pattern", - "item.banner.actuallyadditionsDrill.yellow": "Yellow Drill Pattern", - "item.banner.actuallyadditionsDrill.lightBlue": "LightBlue Drill Pattern", - "item.banner.actuallyadditionsDrill.magenta": "Magenta Drill Pattern", - "item.banner.actuallyadditionsDrill.orange": "Orange Drill Pattern", - "item.banner.actuallyadditionsDrill.white": "White Drill Pattern", + "block.minecraft.banner.actuallyadditions.book.black": "Black Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.red": "Red Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.green": "Green Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.brown": "Brown Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.blue": "Blue Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.purple": "Purple Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.cyan": "Cyan Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.silver": "Silver Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.gray": "Gray Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.pink": "Pink Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.lime": "Lime Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.yellow": "Yellow Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.lightBlue": "LightBlue Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.magenta": "Magenta Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.orange": "Orange Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.book.white": "White Actually Additions Manual Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.black": "Black Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.red": "Red Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.green": "Green Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.brown": "Brown Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.blue": "Blue Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.purple": "Purple Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.cyan": "Cyan Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.silver": "Silver Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.gray": "Gray Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.pink": "Pink Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.lime": "Lime Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.yellow": "Yellow Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.lightBlue": "LightBlue Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.magenta": "Magenta Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.orange": "Orange Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.phan_con.white": "White Phantom Connector Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.black": "Black Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.red": "Red Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.green": "Green Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.brown": "Brown Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.blue": "Blue Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.purple": "Purple Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.cyan": "Cyan Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.silver": "Silver Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.gray": "Gray Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.pink": "Pink Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.lime": "Lime Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.yellow": "Yellow Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.lightBlue": "LightBlue Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.magenta": "Magenta Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.orange": "Orange Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.leaf_blo.white": "White Leaf Blower Pattern", + "block.minecraft.banner.actuallyadditions.drill.black": "Black Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.red": "Red Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.green": "Green Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.brown": "Brown Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.blue": "Blue Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.purple": "Purple Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.cyan": "Cyan Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.silver": "Silver Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.gray": "Gray Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.pink": "Pink Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.lime": "Lime Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.yellow": "Yellow Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.lightBlue": "LightBlue Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.magenta": "Magenta Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.orange": "Orange Drill Pattern", + "block.minecraft.banner.actuallyadditions.drill.white": "White Drill Pattern", "_comment": "Damage Sources", "death.actuallyadditions.atomic_reconstructor.1": "%s got atomically reconstructed.", "death.actuallyadditions.atomic_reconstructor.2": "The Atomic Reconstructor caught %s in its sight.", diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/banner/book.png b/src/main/resources/assets/actuallyadditions/textures/entity/banner/book.png new file mode 100644 index 000000000..a131c6d06 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/banner/book.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/banner/drill.png b/src/main/resources/assets/actuallyadditions/textures/entity/banner/drill.png new file mode 100644 index 000000000..223da6f10 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/banner/drill.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/banner/leaf_blo.png b/src/main/resources/assets/actuallyadditions/textures/entity/banner/leaf_blo.png new file mode 100644 index 000000000..46cb6cc2d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/banner/leaf_blo.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/banner/phan_con.png b/src/main/resources/assets/actuallyadditions/textures/entity/banner/phan_con.png new file mode 100644 index 000000000..6204e09d7 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/banner/phan_con.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/shield/book.png b/src/main/resources/assets/actuallyadditions/textures/entity/shield/book.png new file mode 100644 index 000000000..438902847 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/shield/book.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/shield/drill.png b/src/main/resources/assets/actuallyadditions/textures/entity/shield/drill.png new file mode 100644 index 000000000..9d30ccd84 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/shield/drill.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/shield/leaf_blo.png b/src/main/resources/assets/actuallyadditions/textures/entity/shield/leaf_blo.png new file mode 100644 index 000000000..01c372808 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/shield/leaf_blo.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/entity/shield/phan_con.png b/src/main/resources/assets/actuallyadditions/textures/entity/shield/phan_con.png new file mode 100644 index 000000000..d16115f9e Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/entity/shield/phan_con.png differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_book.png b/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_book.png deleted file mode 100644 index 08b38684e..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_book.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_drill.png b/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_drill.png deleted file mode 100644 index 858ba1746..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_drill.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_leaf_blo.png b/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_leaf_blo.png deleted file mode 100644 index 8d38b0f0e..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_leaf_blo.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_phan_con.png b/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_phan_con.png deleted file mode 100644 index 91e2936e8..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/banner/actuallyadditions_phan_con.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_book.png b/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_book.png deleted file mode 100644 index 8704547c4..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_book.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_drill.png b/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_drill.png deleted file mode 100644 index f7743ffea..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_drill.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_leaf_blo.png b/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_leaf_blo.png deleted file mode 100644 index 7b52a66ae..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_leaf_blo.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_phan_con.png b/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_phan_con.png deleted file mode 100644 index 151dd0ade..000000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/shield/actuallyadditions_phan_con.png and /dev/null differ