Merge branch 'master' of https://github.com/pyanodon/pycoalprocessing

changelog.txt

@@ -1,4 +1,24 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.1.15
+Date: 2024-1-??
+  Changes:
+    - Added an incompatiblity with the "Big bags" mod due to crashes on startup and not being maintained
+---------------------------------------------------------------------------------------------------
+Version: 2.1.14
+Date: 2024-1-19
+  Changes:
+    - Fixed a crash when loading a save where the pycodex was left open
+---------------------------------------------------------------------------------------------------
+Version: 2.1.13
+Date: 2024-1-19
+  Changes:
+    - Made the inserter migration really actually work for real this time
+---------------------------------------------------------------------------------------------------
+Version: 2.1.12
+Date: 2024-1-19
+  Changes:
+    - Made the inserter migration really work for real this time
+---------------------------------------------------------------------------------------------------
 Version: 2.1.11
 Date: 2024-1-19
   Changes:

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pycoalprocessing",
-  "version": "2.1.11",
+  "version": "2.1.14",
   "factorio_version": "1.1",
   "title": "Pyanodons Coal Processing",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",
@@ -16,7 +16,8 @@
     "(?) better-victory-screen",
     "! 248k",
     "! wret-beacon-rebalance-mod",
-    "! beacon-overhaul"
+    "! beacon-overhaul",
+    "! BigBags"
   ],
   "package": {
     "ignore": [],

migrations/2.1.11.lua → migrations/2.1.13.lua

@@ -1,5 +1,9 @@
 local i = 0
 for _, surface in pairs(game.surfaces) do
+    for _, inserter in pairs(surface.find_entities_filtered{name={'long-handed-inserter', 'fast-inserter', 'stack-inserter'}}) do
+        inserter.inserter_filter_mode = 'blacklist'
+    end
+
     for _, inserter in pairs(surface.find_entities_filtered{type='inserter',name={'filter-inserter', 'stack-filter-inserter'}}) do
         local replacement = surface.create_entity{
             name = inserter.name == 'filter-inserter' and 'fast-inserter' or 'stack-inserter',
@@ -21,4 +25,4 @@ for _, surface in pairs(game.surfaces) do
         end
     end
 end
-game.print('Migrated '..i..' filter inserters.')
+if i > 0 then game.print('Migrated '..i..' filter inserters.') end

scripts/wiki/wiki.lua

@@ -15,7 +15,10 @@ end
 
 function Wiki.get_wiki_gui(player)
     local pywiki = player.gui.screen.pywiki
-    if pywiki then return pywiki.pywiki end
+    if not pywiki then return end
+    pywiki = pywiki.pywiki
+    if not pywiki then return pywiki.parent end
+    return pywiki
 end
 function Wiki.get_pages(player) local gui = Wiki.get_wiki_gui(player); if gui and gui.content_flow then return gui.content_flow.py_pages_list end end
 function Wiki.get_page_contents(player) local gui = Wiki.get_wiki_gui(player); if gui and gui.content_flow then return gui.content_flow.page_frame.scroll_pane end end