French translation release prep

* FR translation added

.gitignore

@@ -1 +1,2 @@
 *.zip
+.vscode/*

CREDITS.txt

@@ -5,7 +5,7 @@ CREDITS
 
 All code and graphics created by Deadlock989, with the following exceptions.
 
-Code and graphics modifications after 2020-04-08 by Wyrrrd.
+Code and graphics modifications after 2020-04-08 by Wyrrrd, ickputzdirwech, Friendch and Deadlock989.
 For the latest unmodified version, see https://github.com/Wyrrrd/IndustrialDisplayPlates/tree/cd8778eb3b11f8bde5418088253123b1029dc461
 
 Sounds by thomasevd and Raclure @ freesound.org.

README.md

@@ -10,3 +10,4 @@ If you want to contribute by translating this mod, you can view the existing tra
 ### Credits
 Thanks to [Deadlock989](https://mods.factorio.com/user/Deadlock989) for the [original mod](https://mods.factorio.com/mod/IndustrialDisplays).  
 Sounds by thomasevd and Raclure on freesound.org.  
+Thanks to [Friendch](https://mods.factorio.com/user/Friendch) for the french translation.

changelog.txt

@@ -1,4 +1,34 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.1
+Date: 2021-08-08
+  Locale:
+    - Added french translation (thanks to Friendch)
+---------------------------------------------------------------------------------------------------
+Version: 1.1.0
+Date: 2020-12-02
+  Changes:
+    - Version bump for base game 1.1
+---------------------------------------------------------------------------------------------------
+Version: 0.18.5
+Date: 2020-11-23
+  Bugfixes:
+    - Bumped version to fix version mess
+---------------------------------------------------------------------------------------------------
+Version: 0.18.3
+Date: 2020-11-22
+  Changes:
+    - removed unneeded mipmap for map marker (thanks to Deadlock989)
+    - restored IR compat (thanks to Deadlock989)
+    - fixed steel display migration (again) (thanks to Deadlock989)
+    - fixed styles (thanks to Deadlock989)
+---------------------------------------------------------------------------------------------------
+Version: 0.18.2
+Date: 2020-08-02
+  Changes:
+    - moved plates to Dectorio recipe group (if installed)
+  Bugfixes:
+    - removed check for show_in_library (removed in 0.18.37)
+---------------------------------------------------------------------------------------------------
 Version: 0.18.1
 Date: 2020-05-26
   Bugfixes:

control.lua

@@ -359,7 +359,7 @@ local function create_display_gui(player, selected)
 	local content_frame = frame.add {
 		type = "frame",
 		name = "inner-frame",
-		style = "display_deep_frame",
+		style = "display_inside_frame",
 		direction = "vertical",
 	}
 	content_frame.style.top_margin = 8
@@ -376,7 +376,7 @@ local function create_display_gui(player, selected)
 	local button_table = {}
 	for prototype_type,prototypes in pairs(DID.elem_prototypes) do
 		for _,prototype in pairs(game[prototypes]) do
-			if not DID.displays[prototype.name] and not ((prototype_type == "item" and (prototype.has_flag("hidden") or prototype.show_in_library)) or (prototype_type == "fluid" and prototype.hidden)) then
+			if not DID.displays[prototype.name] and not ((prototype_type == "item" and prototype.has_flag("hidden")) or (prototype_type == "fluid" and prototype.hidden)) then
 				local group = (prototype.group.name == "fluids") and "intermediate-products" or prototype.group.name 
 				if not DID.group_blacklist[group] then
 					if button_table[group] == nil then button_table[group] = {}	end
@@ -469,15 +469,15 @@ local function set_up_display_from_ghost(entity,tags)
 	end
 end
 
-local function reset_globals()
+-- local function reset_globals()
-	global.translations = nil
+	-- global.translations = nil
-end
+-- end
 
 ------------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- event handlers
 
-script.on_configuration_changed(reset_globals)
+-- script.on_configuration_changed(reset_globals)
 script.on_event(defines.events.on_gui_closed, gui_close)
 script.on_event(defines.events.on_gui_click, gui_click)
 script.on_event(defines.events.on_player_mined_entity, event_raised_destroy, get_display_event_filter())

data-updates.lua

@@ -16,4 +16,9 @@ for display,displaydata in pairs(DID.displays) do
 	end
 end
 
+if mods ["Dectorio"] then
+	if data.raw["item-group"]["dectorio"] then
+		data.raw["item-subgroup"]["display-plates"].group = "dectorio"
+	end
+end
 ------------------------------------------------------------------------------------------------------------------------------------------------------

data.lua

@@ -54,13 +54,13 @@ for display,displaydata in pairs(DID.displays) do
 			icon_size = DID.icon_size,
 			icon_mipmaps = DID.icon_mipmaps,
 			corpse = "small-remnants",
-      fast_replaceable_group = "display",
+			fast_replaceable_group = "display",
 			minable = {
 				mining_time = 0.2,
 				result = display,
 			},
 			max_health = 10 + size * 30,
-			flags = {"placeable-player", "placeable-neutral", "player-creation"},
+			flags = {"placeable-player", "placeable-neutral", "player-creation", "not-rotatable"},
 			collision_box = { {-box_size+0.1, -box_size+0.1}, {box_size-0.1, box_size-0.1} },
 			selection_box = { {-box_size, -box_size}, {box_size, box_size} },
 			collision_mask = {
@@ -125,7 +125,7 @@ for display,displaydata in pairs(DID.displays) do
 			result = display,
 			result_count = 1,
 			category = "crafting",
-			enabled = mods["IndustrialRevolution"] and (displaydata.IR_unlock == nil) or (displaydata.unlock == nil),
+			enabled = (mods["IndustrialRevolution"] and (displaydata.IR_unlock == nil)) or (not mods["IndustrialRevolution"] and displaydata.unlock == nil),
 			ingredients = displaydata.ingredients,
 			energy_required = 1,
 		}
@@ -158,11 +158,11 @@ add_styles({
             left_padding = 10,
             right_padding = 10,
             top_padding = 8,
-            graphical_set = data.raw["gui-style"]["default"]["tabbed_pane"]["tab_content_frame"].graphical_set,
             type = "frame_style",
+			graphical_set = data.raw["gui-style"]["default"]["filter_tabbed_pane"]["tab_content_frame"].graphical_set,
         },
         type = "tabbed_pane_style",
-        parent = "tabbed_pane",
+        parent = "filter_tabbed_pane",
         width = 420,
     },
     display_tab = {
@@ -185,9 +185,9 @@ add_styles({
             horizontal_align = "center",
         },
     },
-    display_deep_frame = {
+    display_inside_frame = {
         type = "frame_style",
-        parent = "inside_deep_frame",
+		parent = "inside_shallow_frame",
         vertical_flow_style = {
             type = "vertical_flow_style",
             vertical_spacing = 0,
@@ -196,34 +196,7 @@ add_styles({
     },
     display_tab_deep_frame = {
         type = "frame_style",
-        parent = "subpanel_inset_frame",
+        parent = "slot_button_deep_frame",
-        vertical_flow_style = {
-            type = "vertical_flow_style",
-            vertical_spacing = 0,
-            padding = 0,
-        },
-        graphical_set = {
-          base = {
-            center = {
-              position = {42,8},
-              size = {1,1},
-            },
-            corner_size = 8,
-            draw_type = "outer",
-            position = {85,0},
-          },
-		  shadow = data.raw["gui-style"]["default"]["inside_deep_frame"].graphical_set.shadow,
-        },
-        background_graphical_set = {
-            corner_size = 8,
-            overall_tiling_horizontal_padding = 5,
-            overall_tiling_horizontal_size = 30,
-            overall_tiling_horizontal_spacing = 10,
-            overall_tiling_vertical_padding = 5,
-            overall_tiling_vertical_size = 30,
-            overall_tiling_vertical_spacing = 10,
-            position = { 282, 17 },
-        },
     },
     display_buttons = {
         type = "table_style",
@@ -289,9 +262,7 @@ data:extend({
         priority = "extra-high",
         width = 32,
         height = 32,
-        mipmap_count = 2,
+	flags = {"gui-icon"},
-		scale = 0.5,
-		flags = {"gui-icon"},
     },
     {
         type = "sound",

globals.lua

@@ -20,30 +20,30 @@ return {
 		},
 		["iron-display-small"] = {
 			ingredients = {{"iron-plate",1}},
-			IR_unlock = "deadlock-iron-age",
+			IR_unlock = "ir2-iron-milestone",
 		},
 		["iron-display-medium"] = {
 			ingredients = {{"iron-plate",4}},
-			IR_unlock = "deadlock-iron-age",
+			IR_unlock = "ir2-iron-milestone",
 		},
 		["iron-display"] = {
 			ingredients = {{"iron-plate",9}},
-			IR_unlock = "deadlock-iron-age",
+			IR_unlock = "ir2-iron-milestone",
 		},
 		["steel-display-small"] = {
 			ingredients = {{"steel-plate",1}},
 			unlock = "steel-processing",
-			IR_unlock = "deadlock-steel-age",
+			IR_unlock = "ir2-steel-milestone",
 		},
 		["steel-display-medium"] = {
 			ingredients = {{"steel-plate",4}},
 			unlock = "steel-processing",
-			IR_unlock = "deadlock-steel-age",
+			IR_unlock = "ir2-steel-milestone",
 		},
 		["steel-display"] = {
 			ingredients = {{"steel-plate",9}},
 			unlock = "steel-processing",
-			IR_unlock = "deadlock-steel-age",
+			IR_unlock = "ir2-steel-milestone",
 		},
 	},
 	sizes = {

info.json

@@ -1,10 +1,13 @@
 {
 	"name": "IndustrialDisplayPlates",
-	"version": "0.18.1",
+	"version": "1.1.1",
 	"title": "Industrial Display Plates",
 	"author": "Wyrrrd",
 	"homepage": "https://github.com/Wyrrrd/IndustrialDisplayPlates",
-	"dependencies": ["base >= 0.18.27"],
+	"dependencies": [
+		"base >= 1.1.0",
+		"(?)IndustrialRevolution"
+	],
 	"description": "Big, medium and small signs which display item and fluid icons. Can be used to blueprint map markers.",
-	"factorio_version": "0.18"
+	"factorio_version": "1.1"
 }

locale/fr

@@ -0,0 +1,17 @@
+[entity-name]
+copper-display=Panneau d'affichage en Cuivre (Grand)
+iron-display=Panneau d'affichage en Fer (Grand)
+steel-display=Panneau d'affichage en Acier (Grand)
+copper-display-medium=Panneau d'affichage en Cuivre (Moyen)
+iron-display-medium=Panneau d'affichage en Fer (Moyen)
+steel-display-medium=Panneau d'affichage en Acier (Moyen)
+copper-display-small=Panneau d'affichage en Cuivre (Petit)
+iron-display-small=Panneau d'affichage en Fer (Petit)
+steel-display-small=Panneau d'affichage en Acier (Petit)
+
+[controls]
+display-map-marker=Marqueur de carte
+display-plate=Panneau d'affichage
+
+[entity-description]
+display=Une icône qui peut être reliée à un marqueur sur la carte. Les paramètres seront préservés par les Plans de Construction.

migrations/steel-display.lua

@@ -1,11 +1,11 @@
+local DID = require("globals")
+
 for index, force in pairs(game.forces) do
-  local technologies = force.technologies
+    for display,displaydata in pairs(DID.displays) do
-  local recipes = force.recipes
+        if displaydata.IR_unlock and force.technologies[displaydata.IR_unlock] and force.technologies[displaydata.IR_unlock].researched then
-
+            force.recipes[display].enabled = true
-  if technologies["steel-processing"].researched then
+        elseif displaydata.unlock and force.technologies[displaydata.unlock] and force.technologies[displaydata.unlock].researched then
-    recipes["steel-display-small"].enabled = true
+            force.recipes[display].enabled = true
-    recipes["steel-display-medium"].enabled = true
+        end
-    recipes["steel-display"].enabled = true
+    end
-  end
-
 end