Merge branch 'develop'

FAQ.md

@@ -22,7 +22,7 @@ If you remove the mod, any new items that Dectorio adds to the game will simply
 
 ## Does the mod work in multiplayer games?
 
-Yes, it _usually_ does and is regularly tested in multiplayer games. However, there are sometimes issues that arise when there are large mod packs on your server as there can be compatibility problems between individual mods. These are most often caused by the signs feature in Dectorio so sometimes toggling this off in the mod settings can workaround any errors. If you have an issue with a multiplayer save, [report an issue on GitHub](https://github.com/jpanther/Dectorio/issues) so I can investigate.
+Yes, it _usually_ does and is regularly tested in multiplayer games. However, there are sometimes issues that arise when there are large mod packs on your server as there can be compatibility problems between individual mods. If you have an issue with a multiplayer save, [report an issue on GitHub](https://github.com/jpanther/Dectorio/issues) so I can investigate.
 
 ## What changed in the latest update?
 
@@ -66,6 +66,12 @@ The Lawnmower can also be used to remove corpses from the ground (such as dead b
 
 These are simply additional signals that you can use when making circuit network conditions. For instance, if you had a circuit network that was calculating the battery level of your accumulators, you might find it easier to follow your logic if you assign this a 'battery' signal, rather than using an arbitrary letter or number. They don't offer any other additional functionality.
 
+## What happened to the signs?
+
+Dectorio used to support placing signs however this feature caused a lot of compatibility issues with other mods and was time consuming to maintain. There are now also a number of other mods that provide similar functionality and as a result, signs have now been deprecated. Check out [Industrial Display Plates](https://mods.factorio.com/mod/IndustrialDisplayPlates) or [Text Plates](https://mods.factorio.com/mod/textplates) for high-quality replacements.
+
+Existing saves will still load normally and any existing signs will work however no new signs can be crafted or placed. To remove sign support completely, disable the compatibility setting in your mod settings.
+
 ## I have a sign that's stuck on the map and it cannot be mined. How do I remove it?
 
 Sometimes if something happens while a player is placing a sign - they might be killed, the server goes down, the game crashes, etc. - there can be a situation where the sign is still on the map, but doesn't have an icon. If you try to delete this sign it will say "This cannot be mined." If this is the case, you can run a special command that will find and remove these entities for you. Open the console in game (by default the tilde '~' key) and type `/dect-destroy-orphaned-signs`. If it finds any signs that meet the criteria, you will be told in the console where they were removed.
@@ -112,11 +118,11 @@ While I can't possibly test every combination of mods available, usually Dectori
 
 That's a pity, but that's the nature of modding. If you have a valid concern about something Dectorio is changing that seems contrary to the way something should work, feel free to [raise a new issue on GitHub](https://github.com/jpanther/Dectorio/issues) outlining your concern. If it is something that makes sense to change, I'll definitely look to adjust the mod in a future update. However, please note that Dectorio is designed to make it easy to decorate your factory, and the technology and recipe choices try to be somewhat realistic. The mod settings allow you to toggle individual changes on and off so you can customise it to your own play style. If you still don't like that, then simply don't use the mod! Requests that just whinge about things you don't agree with, without being constructive, will be ignored.
 
-## How do I play with Dectorio on Factorio 0.17.x, 0.16.x or 0.15.x?
+## How do I play with Dectorio on Factorio 0.18.x 0.17.x, 0.16.x or 0.15.x?
 
-The latest versions of Dectorio are designed to work with Factorio 0.18 and later. Due to the way the base game changes with each major release, there's no way to make the latest versions of Dectorio compatible with older versions of Factorio. However, old stable versions of Dectorio are kept available on the mod portal for each major Factorio release.
+The latest versions of Dectorio are designed to work with Factorio 1.0 and later. Due to the way the base game changes with each major release, there's no way to make the latest versions of Dectorio compatible with older versions of Factorio. However, old stable versions of Dectorio are kept available on the mod portal for each major Factorio release.
 
-For Factorio 0.17.x download Dectorio v0.9.16; for Factorio 0.16.x download Dectorio v0.8.11; and for Factorio 0.15.x download Dectorio v0.7.6.
+For Factorio 0.18.x download Dectorio v0.10.9; Factorio 0.17.x download Dectorio v0.9.16; for Factorio 0.16.x download Dectorio v0.8.11; and for Factorio 0.15.x download Dectorio v0.7.6.
 
 Note that these old versions of Dectorio will not be updated with new features, but they will occasionally have bugfixes if it's appropriate. You'll need to upgrade your Factorio version to take advantage of the latest changes.
 

README.md

@@ -56,12 +56,6 @@ Requires Factorio version 0.15 or later.
 
   ![Walls](https://img.pantherx.net/dectorio/walls.png)
 
-### Signs
-
-* Adds placable wooden and steel signs with configurable icons
-
-  ![Signs](https://img.pantherx.net/dectorio/signs.png)
-
 ### Signals & Lamps
 
 * Adds a new Glowing lamp that will glow bright colours over a large radius when passed a coloured signal from the circuit network
@@ -102,27 +96,27 @@ Dectorio uses CrowdIn to allow the community to translate the mod from English i
 
 Special thanks to the translators below (in no particular order).
 
-* Chinese Simplified (76%) - [jessefjxm](https://crowdin.com/profile/jessefjxm).
-* Chinese Traditional (32%) - [k98a](https://crowdin.com/profile/k98a).
-* Czech (79%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
-* French (100%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga).
-* German (100%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn), [lpzockerx](https://crowdin.com/profile/lpzockerx), [Leridon](https://crowdin.com/profile/Leridon) and [Meisterfuchs](https://crowdin.com/profile/Meisterfuchs).
+* Chinese Simplified (74%) - [jessefjxm](https://crowdin.com/profile/jessefjxm).
+* Chinese Traditional (31%) - [k98a](https://crowdin.com/profile/k98a).
+* Czech (76%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
+* French (96%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga).
+* German (96%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn), [lpzockerx](https://crowdin.com/profile/lpzockerx), [Leridon](https://crowdin.com/profile/Leridon) and [Meisterfuchs](https://crowdin.com/profile/Meisterfuchs).
 * Hungarian (100%) - [mmnetworkteam](https://crowdin.com/profile/mmnetworkteam).
-* Korean (88%) - [GimoXagros](https://crowdin.com/profile/GimoXagros).
-* Polish (100%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus).
-* Portuguese, Brazilian (100%) - [celaquila](https://crowdin.com/profile/celaquila) and [Unknow0059](https://crowdin.com/profile/Unknow0059).
+* Korean (85%) - [GimoXagros](https://crowdin.com/profile/GimoXagros).
+* Polish (96%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus).
+* Portuguese, Brazilian (96%) - [celaquila](https://crowdin.com/profile/celaquila) and [Unknow0059](https://crowdin.com/profile/Unknow0059).
 * Russian (100%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777), [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd) and [1avek1](https://crowdin.com/profile/1avek1).
-* Spanish (90%) - [notallme](https://crowdin.com/profile/notallme).
+* Spanish (87%) - [notallme](https://crowdin.com/profile/notallme).
 
 ### Mod Compatibility
 
-**Note:** If playing with Factorio 0.15, please download v0.7.6; for Factorio 0.16, please download v0.8.11; or for Factorio 0.17, please download v0.9.16, as these are the last stable versions supported on these base game releases. v0.10.0 and later are only supported on Factorio 0.18.
+**Note:** If playing with Factorio 0.15, please download v0.7.6; for Factorio 0.16, please download v0.8.11; for Factorio 0.17, please download v0.9.16; for Factorio 0.18 please download v0.10.9, as these are the last stable versions supported on these base game releases. v0.11.0 and later are only supported on Factorio 1.0.
 
 Limited testing has been completed with other mods. Warnings will be shown in-game to highlight any known issues. If you come across a specific compatibility issue, please let me know and I'll see what I can do to fix it.
 
 It is not recommended to use other coloured signal mods at the same time as Dectorio. This can cause coloured signals to be overwritten multiple times and lead to game-breaking compatibility issues with other mods. If you would like more colours, you can add these in the Dectorio config.lua file (instructions are in the file). For full details, visit the [FAQ](https://mods.factorio.com/mod/Dectorio/faq).
 
-Dectorio includes specific support for [Alien Biomes](https://mods.factorio.com/mod/alien-biomes) and [Industrial Revolution](https://mods.factorio.com/mod/IndustrialRevolution).
+Dectorio includes specific support for [Alien Biomes](https://mods.factorio.com/mod/alien-biomes).
 
 Other mods with additional Dectorio support (thanks!): [Concreep](https://mods.factorio.com/mod/Concreep), [Fully Automated Rail Layer (FARL)](https://mods.factorio.com/mod/FARL), [Pavement Drive Assist](https://mods.factorio.com/mod/PavementDriveAssist), [Text Plates](https://mods.factorio.com/mod/textplates) and [Industrial Revolution](https://mods.factorio.com/mod/IndustrialRevolution).
 

changelog.txt

@@ -1,4 +1,20 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.11.0
+Date: 17. 11. 2020
+  Added:
+    - Support for Factorio 1.0
+    - New mod setting to toggle whether decoratives are automatically removed when new entities are built
+    - Grid concrete recipe now matches concrete recipe when AAI Industry mod is present
+  Changed:
+    - Signs can no longer be crafted as sign support will be removed in a future release (use Industrial Display Plates or Text Plates as a replacement). Disable the sign compatibility mod setting to remove sign support from existing saves.
+  Removed:
+    - Support for Factorio 0.18 (use Dectorio version 0.10.9 instead)
+    - Support for Industrial Revolution 1.x mod
+    - Dependencies for third party mods that are no longer being actively maintained
+  Locales:
+    - Updated Hungarian translation (thanks to mmnetworkteam)
+    - Updated Russian translation (thanks to 1avek1)
+---------------------------------------------------------------------------------------------------
 Version: 0.10.9
 Date: 02. 07. 2020
   Bugfixes:

config.lua

@@ -111,6 +111,7 @@ DECT.CONFIG.SETTINGS = {
 	["vanilla_hazard_concrete"] = settings.startup["dectorio-vanilla-hazard-concrete-style"].value,
 	["painted_concrete_speed_modifier"] = settings.startup["dectorio-painted-concrete-speed-modifier"].value,
 	["landscaping_blueprintable"] = settings.startup["dectorio-landscaping-blueprintable"].value,
+	["remove_decoratives_near_entity"] = settings.startup["dectorio-remove-decoratives-near-entity"].value,
 	["flooring_stack_size"] = settings.startup["dectorio-flooring-stack-size"].value,
 	["landscaping_stack_size"] = settings.startup["dectorio-landscaping-stack-size"].value,
 	["walls_stack_size"] = settings.startup["dectorio-walls-stack-size"].value,

control.lua

@@ -302,8 +302,10 @@ end
 
 -- Clear any decorations around a given entity
 local function destroy_decoratives_near_entity(entity)
-	if entity.type ~= "entity-ghost" and entity.type ~= "tile-ghost" then
-		entity.surface.destroy_decoratives({area=entity.bounding_box})
+	if DECT.CONFIG.SETTINGS["remove_decoratives_near_entity"] then
+		if entity.type ~= "entity-ghost" and entity.type ~= "tile-ghost" then
+			entity.surface.destroy_decoratives({area=entity.bounding_box})
+		end
 	end
 end
 

data-final-fixes.lua

@@ -8,12 +8,13 @@ require("prototypes.signal.final-fixes")
 
 if DECT.DEBUG then
 	local function log_tiles()
-	  log("[Dectorio] Tile layers:")
-	  local log_data = {}
-	  for _, tile in pairs(data.raw.tile) do
-	    log_data["layer "..tile.layer] = log_data["layer "..tile.layer] and log_data["layer "..tile.layer]..", "..tile.name or tile.name
-	  end
-	  log(serpent.block(log_data, {comment = false, numformat = '%1.8g'}))
+		log("[Dectorio] Tile layers:")
+		local log_data = {}
+		for _, tile in pairs(data.raw.tile) do
+			log_data["layer " .. tile.layer] =
+				log_data["layer " .. tile.layer] and log_data["layer " .. tile.layer] .. ", " .. tile.name or tile.name
+		end
+		log(serpent.block(log_data, {comment = false, numformat = "%1.8g"}))
 	end
 	log_tiles()
 end

data-updates.lua

@@ -1,4 +1,4 @@
 -- data-updates
 
 require("prototypes.third-party.alien-biomes")
-require("prototypes.third-party.industrial-revolution")
+require("prototypes.third-party.aai-industry")

data.lua

@@ -34,14 +34,12 @@ require("prototypes.item.item-group")
 require("prototypes.item.flooring")
 require("prototypes.item.lamp")
 require("prototypes.item.landscaping")
-require("prototypes.item.signs")
 require("prototypes.item.walls")
 require("prototypes.item.decoratives")
 
 require("prototypes.recipe.flooring")
 require("prototypes.recipe.lamp")
 require("prototypes.recipe.landscaping")
-require("prototypes.recipe.signs")
 require("prototypes.recipe.walls")
 require("prototypes.recipe.decoratives")
 
@@ -50,7 +48,6 @@ require("prototypes.tile.tiles")
 require("prototypes.technology.flooring")
 require("prototypes.technology.lamp")
 require("prototypes.technology.landscaping")
-require("prototypes.technology.signs")
 require("prototypes.technology.walls")
 require("prototypes.technology.decoratives")
 

info.json

@@ -1,17 +1,17 @@
 {
   "name": "Dectorio",
-  "version": "0.10.9",
+  "version": "0.11.0",
   "title": "Dectorio",
   "author": "PantherX",
   "contact": "",
   "homepage": "https://github.com/jpanther/Dectorio",
-  "factorio_version": "0.18",
+  "factorio_version": "1.0",
   "dependencies": [
-    "base >= 0.18.2",
+    "base >= 1.0",
     "? alien-biomes >= 0.5.1",
+    "(?) aai-industry >= 0.4.20",
     "(?) FactorioExtended-Plus-Weaponry >= 0.4.0",
     "(?) H2O >= 0.3.2",
-    "!Expanded_Color_Lamps",
     "!Thaumaturgic-Machinations"
   ],
   "license": "GNU GPLv3"

locale/cs/dectorio.cfg

@@ -13,7 +13,6 @@ dectorio-wood=Povolit dřevěné dlaždice
 dectorio-gravel=Povolit štěrkové dlaždice
 dectorio-concrete=Povolit betonové dlaždice
 dectorio-painted-concrete=Povolit barvné betonové dlaždice
-dectorio-signs=Povolit značky
 dectorio-decoratives=Povolit dekorace
 dectorio-item-group=Oddělit výrobní okno
 dectorio-vanilla-hazard-concrete-style=Použít výchozí Nebezpečí beton
@@ -35,7 +34,6 @@ dectorio-wood=Povoluje výrobu dřevěných podlah
 dectorio-gravel=Umožní pokládat natěženeé materiály na zem jako štěrk
 dectorio-concrete=Povoluje výrobu betonových podlah, včetně mřížkového betonu
 dectorio-painted-concrete=Umožní barevné styly betonu místo původního nebezpečného
-dectorio-signs=Umožní umisťovat cedule
 dectorio-decoratives=Umožní vytvářet dekorativní věci pro tvou továrnu
 dectorio-item-group=Přesune všechny dekorativní věci do vlastního tabu v batohu
 dectorio-vanilla-hazard-concrete-style=Pokud je povoleno, malované nebezpečí betonu bude vypadat jako výchozí Factorio nebezpečí betonu při umístění (vyžaduje malované konkrétní být povolena)

locale/de/dectorio.cfg

@@ -13,7 +13,6 @@ dectorio-wood=Aktiviere Holzkacheln
 dectorio-gravel=Aktiviere Kieskacheln
 dectorio-concrete=Aktiviere Betonkacheln
 dectorio-painted-concrete=Aktiviere bemalte Betonkacheln
-dectorio-signs=Aktiviere Schilder
 dectorio-decoratives=Aktiviere Dekorationen
 dectorio-lawnmower=Aktiviere Rasenmäher
 dectorio-item-group=Separater Crafting Tab
@@ -40,7 +39,6 @@ dectorio-wood=Aktiviert die Fähigkeit, hölzerne Böden herzustellen
 dectorio-gravel=Aktiviert die Möglichkeit für Roherze als Kies platziert zu werden
 dectorio-concrete=Aktiviert die Fähigkeit, Betonböden herzustellen, inklusive Betonplatten
 dectorio-painted-concrete=Aktiviert bemalte Betontypen, die den normalen Beton mit Gefahrenmarkierung ersetzen
-dectorio-signs=Aktiviert die Möglichkeit, Schilder zu herzustellen
 dectorio-decoratives=Aktiviert die Möglichkeit dekorative Gegenstände für deine Fabrik herzustellen
 dectorio-lawnmower=Aktiviert den Rasenmäher, um dekorative Gegenstände zu entfernen
 dectorio-item-group=Verschiebt alle dekorativen Gegenstände in einen eigenen Crafting-Tab im Inventar

locale/en/dectorio.cfg

@@ -13,12 +13,13 @@ dectorio-wood=Enable Wooden Tiles
 dectorio-gravel=Enable Gravel Tiles
 dectorio-concrete=Enable Concrete Tiles
 dectorio-painted-concrete=Enable Painted Concrete Tiles
-dectorio-signs=Enable Signs
+dectorio-signs=Enable compatibility support for Signs
 dectorio-decoratives=Enable Decoratives
 dectorio-lawnmower=Enable Lawnmower
 dectorio-item-group=Separate Crafting Tab
 dectorio-vanilla-hazard-concrete-style=Use default Factorio Hazard concrete style
 dectorio-landscaping-blueprintable=Landscaping items are blueprintable
+dectorio-remove-decoratives-near-entity=Remove decoratives near newly placed entities
 dectorio-painted-concrete-speed-modifier=Painted concrete speed modifier
 dectorio-decorative-removal-probability=Decoration removal probability
 dectorio-flooring-stack-size=Flooring items stack size
@@ -40,7 +41,7 @@ dectorio-wood=Enables the ability to craft wooden flooring types
 dectorio-gravel=Enables the ability for raw ore materials to be placed on the ground as gravel
 dectorio-concrete=Enables the ability to craft concrete flooring types, including grid concrete
 dectorio-painted-concrete=Enables painted concrete styles that replace the base Hazard concrete
-dectorio-signs=Enables the ability to place signs
+dectorio-signs=Signs have been deprecated and will be removed in a future release. This setting adds support for existing sign entities to maintain compatibility with existing saves.
 dectorio-decoratives=Enables the ability to craft decorative items for your factory
 dectorio-lawnmower=Enables the lawnmower tool to remove decorative items from your factory floor
 dectorio-item-group=Moves all decorative items into a dedicated crafting tab in the inventory