Merge #126: Update to Factorio 1.1

narc0tiq · Nov 26, 2020 · 3b053d6 · 3b053d6
2 parents 1a445e5 + f38a577
commit 3b053d6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.8.102
+0.8.201
diff --git a/info.json b/info.json
@@ -1,7 +1,7 @@
 {
     "name": "{{MOD_NAME}}",
     "version": "{{VERSION}}",
-    "factorio_version": "0.18",
+    "factorio_version": "1.1",
     "title": "YARM - Resource Monitor",
     "author": "Octav 'narc' Sandulescu, based on work by drs, jorgenRe, and L0771",
     "homepage": "https://github.com/narc0tiq/YARM",

diff --git a/prototypes/prototypes.lua b/prototypes/prototypes.lua
@@ -11,8 +11,8 @@ data:extend(
         type = 'shortcut',
         name = 'yarm-selector',
         order = "a[yarm]",
-        action = 'create-blueprint-item',
-        item_to_create = 'yarm-selector-tool',
+        action = 'spawn-item',
+        item_to_spawn = 'yarm-selector-tool',
         style = 'green',
         icon = {
             filename = '__{{MOD_NAME}}__/graphics/resource-monitor-x32-white.png',
@@ -42,7 +42,7 @@ data:extend(
         name = 'yarm-selector-tool',
         icon = '__{{MOD_NAME}}__/graphics/resource-monitor.png',
         icon_size = 32,
-        flags = {'only-in-cursor', 'hidden'},
+        flags = {'only-in-cursor', 'hidden', 'spawnable'},
         stack_size = 1,
         stackable = false,
         selection_color = { g = 1 },

diff --git a/remote.lua b/remote.lua
@@ -1,4 +1,5 @@
 require "resmon"
+local mod_gui = require("mod-gui")
 
 local interface = {}
 

diff --git a/resmon.lua b/resmon.lua
@@ -1,7 +1,7 @@
 require "util"
 require "libs/array_pair"
 require "libs/ore_tracker"
-require "mod-gui"
+local mod_gui = require("mod-gui")
 
 -- Sanity: site names aren't allowed to be longer than this, to prevent them
 -- kicking the buttons off the right edge of the screen