From 44471b2379c95999af9b57394317e87c55c4f94e Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Thu, 20 Apr 2023 15:45:33 +0900
Subject: [PATCH] Update

---
 PHI-EN/data.lua  |  8 +-------
 PHI-EN/info.json |  4 ++--
 PHI-EQ/data.lua  | 20 --------------------
 PHI-EQ/info.json |  4 ++--
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/PHI-EN/data.lua b/PHI-EN/data.lua
index d2ff92a..c3d1822 100644
--- a/PHI-EN/data.lua
+++ b/PHI-EN/data.lua
@@ -73,13 +73,7 @@ local function EI(source, tier)
     item.stack_size = 50
     item.default_request_amount = 50
     item.icons = {{icon = graphics_location .. source.name .. '-i.png', icon_mipmaps = 4, icon_size = 64}}
-
-    if (source.type == 'accumulator') then
-        item.order = 'd[' .. source.type .. ']-a' .. tier .. '[' .. source.name .. '-mk' .. tier .. ']'
-    else
-        item.order = 'e[' .. source.type .. ']-a' .. tier .. '[' .. source.name .. '-mk' .. tier .. ']'
-    end
-
+    item.order = item.order .. tier
     data:extend({item})
 end
 
diff --git a/PHI-EN/info.json b/PHI-EN/info.json
index 31c9419..7940a61 100644
--- a/PHI-EN/info.json
+++ b/PHI-EN/info.json
@@ -1,8 +1,8 @@
 {
     "name": "PHI-EN",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "factorio_version": "1.1",
-    "date": "2023-04-19",
+    "date": "2023-04-20",
     "title": "Phidias Energy",
     "author": "PHIDIAS0303",
     "contributers": "",
diff --git a/PHI-EQ/data.lua b/PHI-EQ/data.lua
index 25db5e3..1ba6236 100644
--- a/PHI-EQ/data.lua
+++ b/PHI-EQ/data.lua
@@ -216,26 +216,6 @@ local function EI(source, tier)
     item.stack_size = 20
     item.default_request_amount = 5
     item.icons = {{icon = graphics_location .. source.graphics_name .. '-i.png', icon_mipmaps = 4, icon_size = 64}}
-
-    --[[
-    if (source.type == 'solar-panel') then
-        item.order = 'a[energy-source]-a' .. alpha_order[tier - 1] .. '[' .. source.name .. '-mk' .. tier .. ']'
-    elseif (source.type == 'battery') then
-        item.order = 'b[battery]-b' .. alpha_order[tier] .. '[' .. source.name .. 'equipment-mk' .. tier .. ']'
-    elseif (source.type == 'fusion-reactor') then
-        item.order = 'a[energy-source]-b' .. alpha_order[tier - 1] .. '[' .. source.name .. '-mk' .. tier .. ']'
-    elseif (source.type == 'personal-laser-defense') then
-        item.order = 'd[active-defense]-b' .. alpha_order[tier - 1] .. '[' .. source.name .. '-mk' .. tier .. ']'
-    elseif (source.type == 'energy-shield') then
-        item.order = 'b[shield]-c' .. alpha_order[tier - 1] .. '[' .. source.name .. '-equipment-mk' .. tier .. ']'
-    elseif (source.type == 'personal-roboport') then
-        item.order = 'e[robotics]-b' .. alpha_order[tier - 1] .. '[' .. source.name .. '-mk' .. tier .. '-equipment]'
-    elseif (source.type == 'night-vision') then
-        item.order = 'f[night-vision]-a' .. alpha_order[tier - 1] .. '[' .. source.name .. '-mk' .. tier .. ']'
-    elseif (source.type == 'exoskeleton') then
-        item.order = 'd[exoskeleton]-a' .. alpha_order[tier - 1] .. '[' .. source.name .. 'equipment-mk' .. tier .. ']'
-    end
-    ]]
     item.order = item.order .. tier
     data:extend({item})
 end
diff --git a/PHI-EQ/info.json b/PHI-EQ/info.json
index ab2cdc1..3520741 100644
--- a/PHI-EQ/info.json
+++ b/PHI-EQ/info.json
@@ -1,8 +1,8 @@
 {
     "name": "PHI-EQ",
-    "version": "1.1.10",
+    "version": "1.1.11",
     "factorio_version": "1.1",
-    "date": "2023-04-19",
+    "date": "2023-04-20",
     "title": "Phidias Equipment",
     "author": "PHIDIAS0303",
     "contributers": "",