diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx index 5ed62a93..6da6c071 100644 --- a/PCK-Studio/MainForm.resx +++ b/PCK-Studio/MainForm.resx @@ -130,7 +130,7 @@ - 167, 22 + 180, 22 Folder @@ -152,7 +152,7 @@ - 167, 22 + 180, 22 Skin @@ -174,7 +174,7 @@ - 167, 22 + 180, 22 Animated Texture @@ -188,13 +188,13 @@ - 167, 22 + 180, 22 Audio.pck - 167, 22 + 180, 22 Colours.col @@ -460,7 +460,7 @@ Generate MipMap Texture - 211, 268 + 211, 290 contextMenuPCKEntries @@ -33432,9 +33432,6 @@ AP//AAA= - - NoControl - 1064, 660 diff --git a/PCK-Studio/Resources/items.png b/PCK-Studio/Resources/items.png index a39f3d3d..9e57f97f 100644 Binary files a/PCK-Studio/Resources/items.png and b/PCK-Studio/Resources/items.png differ diff --git a/PCK-Studio/Resources/terrain.png b/PCK-Studio/Resources/terrain.png index 1688c5bb..9b6d1791 100644 Binary files a/PCK-Studio/Resources/terrain.png and b/PCK-Studio/Resources/terrain.png differ diff --git a/PCK-Studio/Resources/tileData.json b/PCK-Studio/Resources/tileData.json index b8a278e3..32173d57 100644 --- a/PCK-Studio/Resources/tileData.json +++ b/PCK-Studio/Resources/tileData.json @@ -512,8 +512,8 @@ { "coral_fan_pink": "Brain Coral Fan" }, { "coral_fan_red": "Fire Coral Fan" }, { "coral_fan_yellow": "Horn Coral Fan" }, - { "coral_layered_top_red": "Fire Coral (Overlay)" }, - { "coral_layered_top_yellow": "Horn Coral (Overlay)" }, + { "bamboo_stem": "Bamboo (Stem) [PS4 ONLY]" }, + { "bamboo_leaf_small": "Bamboo (Small Leaves) [PS4 ONLY]" }, { "kelp_a": "Kelp (Bottom)" }, { "": "" }, { "": "" }, @@ -528,7 +528,7 @@ { "coral_fan_pink_dead": "Dead Brain Coral Fan" }, { "coral_fan_red_dead": "Dead Fire Coral Fan" }, { "coral_fan_yellow_dead": "Dead Horn Coral Fan" }, - { "": "" }, + { "bamboo_leaf": "Bamboo (Leaves) [PS4 ONLY]" }, { "spruce_trapdoor": "Spruce Trapdoor" }, { "stripped_log_oak": "Stripped Oak Log (Side)" }, { "stripped_log_oak_top": "Stripped Oak Log (Top)" }, @@ -545,7 +545,87 @@ { "acacia_trapdoor": "Acacia Trapdoor" }, { "birch_trapdoor": "Birch Trapdoor" }, { "dark_oak_trapdoor": "Dark Oak Trapdoor" }, - { "jungle_trapdoor": "Jungle Trapdoor" } + { "jungle_trapdoor": "Jungle Trapdoor" }, + { "bamboo_sapling": "Bamboo Sapling [PS4 ONLY]" }, + { "bamboo_singleleaf": "Bamboo (Single Leaf) [PS4 ONLY]" }, + { "flower_lily_of_the_valley": "Lily of the Valley [PS4 ONLY]" }, + { "flower_cornflower": "Cornflower [PS4 ONLY]" }, + { "": "" }, + { "berry_bush_sapling": "Sweet Berry Bush (Stage 1) [PS4 ONLY]" }, + { "berry_bush_no_berries": "Sweet Berry Bush (Stage 2) [PS4 ONLY]" }, + { "berry_bush_some_berries": "Sweet Berry Bush (Stage 3) [PS4 ONLY]" }, + { "berry_bush_full_berries": "Sweet Berry Bush (Stage 4) [PS4 ONLY]" }, + { "campfire_log": "Campfire (Log) [PS4 ONLY]" }, + { "campfire_log_lit": "Campfire (Log) (Lit) [PS4 ONLY]" }, + { "campfire_smoke": "Campfire (Smoke) [PS4 ONLY]" }, + { "campfire": "Campfire (Flame) [PS4 ONLY]" }, + { "scaffolding_side": "Scaffolding (Side) [PS4 ONLY]" }, + { "scaffolding_bottom": "Scaffolding (Bottom) [PS4 ONLY]" }, + { "scaffolding_top": "Scaffolding (Top) [PS4 ONLY]" }, + { "barrel_side": "Barrel (Side) [PS4 ONLY]" }, + { "barrel_top": "Barrel (Top) [PS4 ONLY]" }, + { "barrel_bottom": "Barrel (Bottom) [PS4 ONLY]" }, + { "bell_side": "Bell (Side) [PS4 ONLY]" }, + { "bell_top": "Bell (Top) [PS4 ONLY]" }, + { "bell_bottom": "Bell (Bottom) [PS4 ONLY]" }, + { "lantern": "Lantern [PS4 ONLY]" }, + { "jigsaw_side": "Jigsaw (Side) [PS4 ONLY]" }, + { "jigsaw_top": "Jigsaw (Top) [PS4 ONLY]" }, + { "blast_furnace_front": "Blast Furnace (Front) [PS4 ONLY]" }, + { "blast_furnace_front_on": "Blast Furnace (Front) (Lit) [PS4 ONLY]" }, + { "blast_furnace_side": "Blast Furnace (Side) [PS4 ONLY]" }, + { "blast_furnace_top": "Blast Furnace (Top) [PS4 ONLY]" }, + { "grindstone_side": "Grindstone (Side) [PS4 ONLY]" }, + { "grindstone_round": "Grindstone (Round) [PS4 ONLY]" }, + { "grindstone_pivot": "Grindstone (Pivot) [PS4 ONLY]" }, + { "cartography_table_side1": "Cartography Table (Back) [PS4 ONLY]" }, + { "cartography_table_side2": "Cartography Table (Right Side) [PS4 ONLY]" }, + { "cartography_table_side3": "Cartography Table (Front and Left Side) [PS4 ONLY]" }, + { "cartography_table_top": "Cartography Table (Top) [PS4 ONLY]" }, + { "lectern_sides": "Lectern (Side) [PS4 ONLY]" }, + { "lectern_front": "Lectern (Front) [PS4 ONLY]" }, + { "lectern_base": "Lectern (Base) [PS4 ONLY]" }, + { "lectern_top": "Lectern (Top) [PS4 ONLY]" }, + { "loom_side": "Loom (Side) [PS4 ONLY]" }, + { "loom_front": "Loom (Front) [PS4 ONLY]" }, + { "loom_top": "Loom (Top) [PS4 ONLY]" }, + { "loom_bottom": "Loom (Bottom) [PS4 ONLY]" }, + { "smithing_table_side": "Smithing Table (Side) [PS4 ONLY]" }, + { "smithing_table_front": "Smithing Table (Front) [PS4 ONLY]" }, + { "smithing_table_top": "Smithing Table (Top) [PS4 ONLY]" }, + { "composter_top": "Composter (Top) [PS4 ONLY]" }, + { "fletcher_table_side2": "Fletching Table (Front and Back) [PS4 ONLY]" }, + { "fletcher_table_side1": "Fletching Table (Side) [PS4 ONLY]" }, + { "fletcher_table_top": "Fletching Table (Top) [PS4 ONLY]" }, + { "stonecutter2_saw": "Stonecutter (Saw) [PS4 ONLY]" }, + { "stonecutter2_side": "Stonecutter (Side) [PS4 ONLY]" }, + { "stonecutter2_top": "Stonecutter (Top) [PS4 ONLY]" }, + { "stonecutter2_bottom": "Stonecutter (Bottom) [PS4 ONLY]" }, + { "smoker_side": "Smoker (Side) [PS4 ONLY]" }, + { "smoker_front": "Smoker (Front) [PS4 ONLY]" }, + { "smoker_front_on": "Smoker (Front) (Lit) [PS4 ONLY]" }, + { "smoker_top": "Smoker (Top) [PS4 ONLY]" }, + { "smoker_bottom": "Smoker (Bottom) [PS4 ONLY]" }, + { "compost": "Compost [PS4 ONLY]" }, + { "compost_ready": "Compost (Ready) [PS4 ONLY]" }, + { "composter_bottom": "Composter (Bottom) [PS4 ONLY]" }, + { "composter_side": "Composter (Side) [PS4 ONLY]" }, + { "barrel_top_open": "Barrel (Top) (Open) [PS4 ONLY]" }, + { "smithing_table_bottom": "Smithing Table (Bottom) [PS4 ONLY]" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" }, + { "": "" } ], "items": [ { "helmetCloth": "Leather Cap" }, @@ -590,7 +670,7 @@ { "ingotGold": "Gold Ingot" }, { "sulphur": "Gunpowder" }, { "bread": "Bread" }, - { "sign": "Sign" }, + { "sign": "Oak Sign" }, { "doorWood": "Oak Door" }, { "doorIron": "Iron Door" }, { "bed": "Bed" }, @@ -805,12 +885,12 @@ { "bucketPuffer": "Bucket of Pufferfish" }, { "bucketTropical": "Bucket of Tropical Fish" }, { "leather_horse_armor_detail": "Leather Horse Armor (Overlay)" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, - { "": "" }, + { "dyePowder_black1": "Black Dye [PS4 ONLY]" }, + { "dyePowder_blue1": "Blue Dye [PS4 ONLY]" }, + { "dyePowder_brown1": "Brown Dye [PS4 ONLY]" }, + { "dyePowder_white1": "White Dye [PS4 ONLY]" }, + { "bamboo": "Bamboo" }, + { "lantern_carried": "Lantern" }, { "kelp": "Kelp" }, { "dried_kelp": "Dried Kelp" }, { "sea_pickle": "Sea Pickle" }, @@ -819,6 +899,22 @@ { "turtle_helmet": "Turtle Shell" }, { "turtle_shell_piece": "Scute" }, { "trident": "Trident" }, - { "phantom_membrane": "Phantom Membrane" } + { "phantom_membrane": "Phantom Membrane" }, + { "acacia_sign": "Acacia Sign [PS4 ONLY]" }, + { "birch_sign": "Birch Sign [PS4 ONLY]" }, + { "dark_oak_sign": "Dark Oak Sign [PS4 ONLY]" }, + { "jungle_sign": "Jungle Sign [PS4 ONLY]" }, + { "spruce_sign": "Spruce Sign [PS4 ONLY]" }, + { "crossbow": "Crossbow [PS4 ONLY]" }, + { "crossbow_pull_0": "Crossbow (Pulling Stage 1) [PS4 ONLY]" }, + { "crossbow_pull_1": "Crossbow (Pulling Stage 2) [PS4 ONLY]" }, + { "crossbow_pull_2": "Crossbow (Pulling Stage 3) [PS4 ONLY]" }, + { "crossbow_arrow": "Crossbow (Loaded) [PS4 ONLY]" }, + { "crossbow_firework": "Crossbow (Loaded) (Firework) [PS4 ONLY]" }, + { "sweet_berries": "Sweet Berries [PS4 ONLY]" }, + { "banner_pattern": "Banner Pattern [PS4 ONLY]" }, + { "bell": "Bell [PS4 ONLY]" }, + { "campfire_carried": "Campfire [PS4 ONLY]" }, + { "": "" } ] }