From a28582798027de31f42df463d8d31aa85d914565 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 4 Feb 2019 12:38:36 +0100 Subject: [PATCH] Change powered rail texture names to fix MTG clash --- mods/ENTITIES/mcl_minecarts/rails.lua | 2 +- ...s_rail_pwr.png => mcl_minecarts_rail_golden.png} | Bin ...r.png => mcl_minecarts_rail_golden_crossing.png} | Bin ...pwr.png => mcl_minecarts_rail_golden_curved.png} | Bin ...png => mcl_minecarts_rail_golden_t_junction.png} | Bin tools/Conversion_Table.csv | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename mods/ENTITIES/mcl_minecarts/textures/{carts_rail_pwr.png => mcl_minecarts_rail_golden.png} (100%) rename mods/ENTITIES/mcl_minecarts/textures/{carts_rail_crossing_pwr.png => mcl_minecarts_rail_golden_crossing.png} (100%) rename mods/ENTITIES/mcl_minecarts/textures/{carts_rail_curved_pwr.png => mcl_minecarts_rail_golden_curved.png} (100%) rename mods/ENTITIES/mcl_minecarts/textures/{carts_rail_t_junction_pwr.png => mcl_minecarts_rail_golden_t_junction.png} (100%) diff --git a/mods/ENTITIES/mcl_minecarts/rails.lua b/mods/ENTITIES/mcl_minecarts/rails.lua index 1058ba35..04f420f8 100644 --- a/mods/ENTITIES/mcl_minecarts/rails.lua +++ b/mods/ENTITIES/mcl_minecarts/rails.lua @@ -78,7 +78,7 @@ register_rail("mcl_minecarts:rail", -- Powered rail (off = brake mode) register_rail("mcl_minecarts:golden_rail", - {"carts_rail_pwr.png", "carts_rail_curved_pwr.png", "carts_rail_t_junction_pwr.png", "carts_rail_crossing_pwr.png"}, + {"mcl_minecarts_rail_golden.png", "mcl_minecarts_rail_golden_curved.png", "mcl_minecarts_rail_golden_t_junction.png", "mcl_minecarts_rail_golden_crossing.png"}, { description = "Powered Rail", _doc_items_longdesc = "Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.", diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden.png similarity index 100% rename from mods/ENTITIES/mcl_minecarts/textures/carts_rail_pwr.png rename to mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden.png diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_crossing_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_crossing.png similarity index 100% rename from mods/ENTITIES/mcl_minecarts/textures/carts_rail_crossing_pwr.png rename to mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_crossing.png diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_curved_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_curved.png similarity index 100% rename from mods/ENTITIES/mcl_minecarts/textures/carts_rail_curved_pwr.png rename to mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_curved.png diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_t_junction_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_t_junction.png similarity index 100% rename from mods/ENTITIES/mcl_minecarts/textures/carts_rail_t_junction_pwr.png rename to mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_t_junction.png diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 4f1992a2..5567b27f 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -448,7 +448,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/items,map_empty.png,/mods/ITEMS/mcl_maps/textures,mcl_maps_map_empty.png,,,,,,, /assets/minecraft/textures/items,map_filled_markings.png,/mods/ITEMS/mcl_maps/textures,mcl_maps_map_filled_markings.png,,,,,,, /assets/minecraft/textures/items,map_filled.png,/mods/ITEMS/mcl_maps/textures,mcl_maps_map_filled.png,,,,,,, -/assets/minecraft/textures/blocks,rail_golden.png,/mods/ENTITIES/mcl_minecarts/textures,carts_rail_pwr.png,,,,,,, +/assets/minecraft/textures/blocks,rail_golden.png,/mods/ENTITIES/mcl_minecarts/textures,mcl_minecarts_rail_golden.png,,,,,,, /assets/minecraft/textures/blocks,rail_golden_powered.png,/mods/ENTITIES/mcl_minecarts/textures,mcl_minecarts_rail_golden_powered.png,,,,,,, /assets/minecraft/textures/blocks,rail_normal_turned.png,/mods/ENTITIES/mcl_minecarts/textures,default_rail_curved.png,,,,,,, /assets/minecraft/textures/blocks,rail_normal.png,/mods/ENTITIES/mcl_minecarts/textures,default_rail.png,,,,,,,