Merge branch 'develop'

README.md

@@ -47,3 +47,5 @@ This project is licensed under the MIT License.
   - [pindab0ter](https://github.com/pindab0ter)
 - Polish
   - [skill3472](https://github.com/skill3472)
+- Russian
+  - [dodther](https://github.com/dodther)

TODO.md

@@ -1,45 +1,19 @@
 ## Must
 
-- [x] Create custom GUI
-  - [x] Get proof of concept working
-  - [x] Create front end
-  - [x] Handle GUI interactions
-  - [x] Prevent changing settings for non-rightmost signals to prevent confusion
-    - [x] Clear settings for Nixie Tube whenever they have a western neighbor
-    - [x] Redraw Nixie Tube when adding a western neighbor
-    - [x] Fix UI not responding on fresh save
-- [x] Rewrite rendering code
-  - [x] Add sprite caching back in
-  - [x] Further improve performance if possible
-  - [x] Fix z-fighting
-- [x] Fix circuit connection visuals
-- [x] Fix "Turned off during daytime" in popup on hover
-- [x] Fix memory leak when removing Nixie Tubes
-- [x] Implement small and big reinforced Nixie Tubes
-- [x] Test upgrade to 2.0 path
-- [x] Fix upgrade to 2.0 path
+- [ ] Use new GUI on ghosts
 
 ## Should
 
 - [ ] Improve performance of configure_nixie_tube
 - [ ] New art
 - [ ] Do not update Nixie Tubes that are not in view
   - [ ] Make sure Nixie Tubes are updated even when the controller is out of view
-- [x] Rename entities both in code and localisation
-  - [x] 'Old Nixie Tube' to either 'Classic Nixie Tube'
-  - [x] 'Nixie Tube' to 'Reinforced Nixie Tube'
-  - [x] Write migrations
-- [x] Improve phrasing and naming for settings
-  - [x] Remove update_delay setting?
-- [x] Figure out why activity light works for Classix Nixie Tube, but not the other ones
-- [x] Split up GUI and controller code
 
 ## Could
 
 - [ ] Add sound on open/close GUI
   - [ ] Find out how to trigger close_sound
   - [ ] Add open sound only when opening GUI
 - [ ] Prevent opening the GUI again if it is already open
-- [x] Show the Nixie Tube preview in the GUI with rendered digits
 
 ## Won't

changelog.txt

@@ -1,9 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.8
+Date: 2024-12-09
+  Translation:
+    - Added Russian translation (credit to dodther)
+---------------------------------------------------------------------------------------------------
 Version: 0.2.7
 Date: 2024-12-05
   Bugfixes:
-    - Fix crash when removing a Nixie Tube from a space platform
-    - Fix crash when deleting a surface with Nixie Tubes on it
+    - Fixed crash when removing a Nixie Tube from a space platform
+    - Fixed crash when deleting a surface with Nixie Tubes on it
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.6
 Date: 2024-11-29
@@ -37,8 +42,8 @@ Date: 2024-11-26
   Optimizations:
     - Prevented updating Nixie Tubes on surfaces nobody is looking at
   Translation:
-    - Polish translation (credit to skill3472)
-    - Dutch translation (credit to pindab0ter)
+    - Added Polish translation (credit to skill3472)
+    - Added Dutch translation (credit to pindab0ter)
   Bugfixes:
     - Fixed Nixie Tubes updating multiple times in one tick
     - Fixed not always using the full updates per tick budget

info.json

@@ -1,6 +1,6 @@
 {
   "name": "UPSFriendlyNixieTubeDisplay",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "factorio_version": "2.0",
   "title": "UPS Friendly Nixie Tubes",
   "author": "Red_Wizard, pindab0ter",

locale/ru/ru.cfg

@@ -0,0 +1,27 @@
+[entity-name]
+nixie-tube=Газоразрядный индикатор
+classic-nixie-tube=Класический газоразрядный индикатор
+classic-nixie-tube-sprite=__ENTITY__classic-nixie-tube__
+reinforced-nixie-tube=Обновлённый газоразрядный индикатор
+reinforced-nixie-tube-sprite=__ENTITY__reinforced-nixie-tube__
+small-reinforced-nixie-tube=Небольшой обновлённый газоразрядный индикатор
+small-reinforced-nixie-tube-sprite=__ENTITY__small-reinforced-nixie-tube__
+
+[entity-description]
+classic-nixie-tube=Отображает сигналы логической сети. Могут быть соединены в цепочку для отображения больших значений.
+reinforced-nixie-tube=Отображает сигналы логической сети. Могут быть соединены в цепочку для отображения больших значений.
+small-reinforced-nixie-tube=Отображает сигналы логической сети. Могут быть соединены в цепочку для отображения больших значений.
+
+[technology-name]
+classic-nixie-tubes=Класические газоразрядные индикаторы
+reinforced-nixie-tubes=Обновлённые газоразрядные индикаторы
+
+[technology-description]
+classic-nixie-tubes=Газоразрядные индикаторы для отображения сигналов логической сети. Могут быть соединены в цепочку для отображения больших значений.
+reinforced-nixie-tubes=Обновлённые и маленькие обновлённые газоразрядные индикаторы для отображения сигналов логической сети. Могут быть соединены в цепочку для отображения больших значений.
+
+[mod-setting-name]
+nixie-tube-group-updates-per-tick=Объединять обновление за тик
+
+[mod-setting-description]
+nixie-tube-group-updates-per-tick=Максимальное количество __ENTITY__nixie-tube__ группируется для обновления за тик. Более высокое число будет обновлять трубки быстрее, но будет требовать больше ресурсов.

prototypes/classic-nixie-tube.lua

@@ -51,7 +51,7 @@ data:extend {
         icon = "__UPSFriendlyNixieTubeDisplay__/graphics/classic-nixie-tube-icon.png",
         icon_size = 32,
         subgroup = "circuit-network",
-        order = "c-a-a",
+        order = "a[lamp]-b[nixie-tube]-a[classic]",
         place_result = "classic-nixie-tube",
         stack_size = 50
     },

prototypes/reinforced-nixie-tube.lua

@@ -51,7 +51,7 @@ data:extend {
         icon = "__UPSFriendlyNixieTubeDisplay__/graphics/reinforced-nixie-tube-icon.png",
         icon_size = 32,
         subgroup = "circuit-network",
-        order = "c-a-b",
+        order = "a[lamp]-b[nixie-tube]-b[reinforced]",
         place_result = "reinforced-nixie-tube",
         stack_size = 50
     },

prototypes/small-reinforced-nixie-tube.lua

@@ -51,7 +51,7 @@ data:extend {
         icon = "__UPSFriendlyNixieTubeDisplay__/graphics/small-reinforced-nixie-tube-icon.png",
         icon_size = 32,
         subgroup = "circuit-network",
-        order = "c-a-c",
+        order = "a[lamp]-b[nixie-tube]-c[small]",
         place_result = "small-reinforced-nixie-tube",
         stack_size = 50
     },