From b515ad2a188eb81f5484c95993675c5146587cef Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Thu, 24 Aug 2023 20:04:20 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20twitch=20drops?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/data/twitchDrops.json | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/assets/data/twitchDrops.json b/assets/data/twitchDrops.json index b1f17502..8180797d 100644 --- a/assets/data/twitchDrops.json +++ b/assets/data/twitchDrops.json @@ -1134,7 +1134,7 @@ "DayNumber": 3, "Rewards": [ { - "Id": "build907", + "Id": "build981", "WatchTimeInMin": 15 }, { @@ -1142,23 +1142,19 @@ "WatchTimeInMin": 15 }, { - "Id": "build431", - "WatchTimeInMin": 30 - }, - { - "Id": "build969", + "Id": "build925", "WatchTimeInMin": 30 }, { - "Id": "other210", + "Id": "build1003", "WatchTimeInMin": 60 }, { - "Id": "other343", + "Id": "other395", "WatchTimeInMin": 120 }, { - "Id": "other339", + "Id": "other392", "WatchTimeInMin": 180 } ] @@ -1167,7 +1163,7 @@ "DayNumber": 4, "Rewards": [ { - "Id": "build981", + "Id": "build917", "WatchTimeInMin": 15 }, { @@ -1175,19 +1171,19 @@ "WatchTimeInMin": 15 }, { - "Id": "build925", + "Id": "build962", "WatchTimeInMin": 30 }, { - "Id": "build1003", + "Id": "build921", "WatchTimeInMin": 60 }, { - "Id": "other395", + "Id": "other398", "WatchTimeInMin": 120 }, { - "Id": "other392", + "Id": "other393", "WatchTimeInMin": 180 } ] @@ -1196,7 +1192,7 @@ "DayNumber": 5, "Rewards": [ { - "Id": "build917", + "Id": "build918", "WatchTimeInMin": 15 }, { @@ -1204,19 +1200,19 @@ "WatchTimeInMin": 15 }, { - "Id": "build962", + "Id": "build930", "WatchTimeInMin": 30 }, { - "Id": "build921", + "Id": "other211", "WatchTimeInMin": 60 }, { - "Id": "other398", + "Id": "other296", "WatchTimeInMin": 120 }, { - "Id": "other393", + "Id": "other394", "WatchTimeInMin": 180 } ] From 4c26e2053a8c3d78820c52af4aca7804598f1215 Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Thu, 24 Aug 2023 21:51:18 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=A6=20Recompile=20after=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/data/controllerLookup.json | 156 +++++++++--------- assets/json/de/Buildings.lang.json | 15 +- assets/json/de/Others.lang.json | 18 +- assets/json/en/Buildings.lang.json | 15 +- assets/json/en/Others.lang.json | 18 +- assets/json/en/TechnologyModule.lang.json | 1 + assets/json/es-la/Buildings.lang.json | 15 +- assets/json/es-la/Others.lang.json | 18 +- assets/json/es/Buildings.lang.json | 15 +- assets/json/es/Others.lang.json | 18 +- assets/json/fr/Buildings.lang.json | 15 +- assets/json/fr/Others.lang.json | 18 +- assets/json/it/Buildings.lang.json | 15 +- assets/json/it/Others.lang.json | 18 +- assets/json/ja/Buildings.lang.json | 15 +- assets/json/ja/Others.lang.json | 18 +- assets/json/ko/Buildings.lang.json | 15 +- assets/json/ko/Others.lang.json | 18 +- assets/json/nl/Buildings.lang.json | 15 +- assets/json/nl/Others.lang.json | 18 +- assets/json/pl/Buildings.lang.json | 15 +- assets/json/pl/Others.lang.json | 18 +- assets/json/pt-br/Buildings.lang.json | 15 +- assets/json/pt-br/Others.lang.json | 18 +- assets/json/pt/Buildings.lang.json | 15 +- assets/json/pt/Others.lang.json | 18 +- assets/json/ru/Buildings.lang.json | 15 +- assets/json/ru/Others.lang.json | 18 +- assets/json/zh-hans/Buildings.lang.json | 15 +- assets/json/zh-hans/Others.lang.json | 18 +- assets/json/zh-hant/Buildings.lang.json | 15 +- assets/json/zh-hant/Others.lang.json | 18 +- linux/flutter/generated_plugin_registrant.cc | 12 -- linux/flutter/generated_plugins.cmake | 3 - macos/Flutter/GeneratedPluginRegistrant.swift | 14 -- .../flutter/generated_plugin_registrant.cc | 12 -- windows/flutter/generated_plugins.cmake | 4 - 37 files changed, 315 insertions(+), 382 deletions(-) diff --git a/assets/data/controllerLookup.json b/assets/data/controllerLookup.json index 4ac5151b..e0235902 100644 --- a/assets/data/controllerLookup.json +++ b/assets/data/controllerLookup.json @@ -34,7 +34,7 @@ }, { "Key": "BUILD_SNAPPING", - "Icon": "KEYBOARD/KEY.Q.png" + "Icon": "KEYBOARD/KEY.V.png" }, { "Key": "CYCLEALTWEAPON", @@ -50,27 +50,19 @@ }, { "Key": "EXOBOOST", - "Icon": "KEYBOARD/KEYWIDE.SPACE.png" + "Icon": "KEYBOARD/KEYWIDE.LSHIFT.png" }, { "Key": "EXOJUMP", - "Icon": "KEYBOARD/KEYWIDE.LCTRL.png" + "Icon": "KEYBOARD/KEYWIDE.SPACE.png" }, { "Key": "FE_ALT1", "Icon": "KEYBOARD/INTERACT.E.png" }, - { - "Key": "FE_ALT1X", - "Icon": "KEYBOARD/KEY.X.png" - }, { "Key": "FE_SELECT", - "Icon": "KEYBOARD/KEY.T.png" - }, - { - "Key": "FE_SELECTX", - "Icon": "MOUSE/KEY.MOUSERIGHT.png" + "Icon": "MOUSE/KEY.MOUSELEFT.png" }, { "Key": "GALACTICMAP_SCAN", @@ -82,11 +74,11 @@ }, { "Key": "GALAXYSCAN", - "Icon": "KEYBOARD/KEYWIDE.BACKSPACE.png" + "Icon": "KEYBOARD/KEYWIDE.TAB.png" }, { "Key": "INVENTORY", - "Icon": "KEYBOARD/KEY.R.png" + "Icon": "KEYBOARD/KEYWIDE.TAB.png" }, { "Key": "JUMP", @@ -94,11 +86,11 @@ }, { "Key": "PIN", - "Icon": "KEYBOARD/KEY.T.png" + "Icon": "KEYBOARD/KEY.X.png" }, { "Key": "PIN_BUILD", - "Icon": "KEYBOARD/KEY.Y.png" + "Icon": "KEYBOARD/KEY.L.png" }, { "Key": "PLAYER_DECONSTRUCT", @@ -124,6 +116,10 @@ "Key": "QUICK_MENU", "Icon": "KEYBOARD/KEY.X.png" }, + { + "Key": "REPAIR", + "Icon": "MOUSE/KEY.MOUSELEFT.png" + }, { "Key": "SCAN", "Icon": "KEYBOARD/KEY.C.png" @@ -158,7 +154,7 @@ }, { "Key": "SHIPZOOM", - "Icon": "KEYBOARD/KEYWIDE.TAB.png" + "Icon": "MOUSE/KEY.MOUSERIGHT.png" }, { "Key": "SLASH", @@ -166,15 +162,11 @@ }, { "Key": "SURVEYFILTERL", - "Icon": "KEYBOARD/KEY.L.png" - }, - { - "Key": "SURVEYFILTERR", "Icon": "KEYBOARD/KEY.1.png" }, { - "Key": "TELEPORT_AIM", - "Icon": "KEYBOARD/KEY.K.png" + "Key": "SURVEYFILTERR", + "Icon": "KEYBOARD/KEY.3.png" }, { "Key": "THRUST", @@ -198,7 +190,7 @@ }, { "Key": "VEHICLESCAN", - "Icon": "KEYBOARD/KEYWIDE.LSHIFT.png" + "Icon": "KEYBOARD/KEY.C.png" }, { "Key": "ZOOM", @@ -240,7 +232,7 @@ }, { "Key": "BUILD_SNAPPING", - "Icon": "DS4/PS.WHITE.TRIANGLE.png" + "Icon": "DS4/PSBUTTON.DPADDOWN.png" }, { "Key": "CYCLEALTWEAPON", @@ -256,39 +248,31 @@ }, { "Key": "EXOBOOST", - "Icon": "DS4/PS.WHITE.CROSS.png" + "Icon": "DS4/PS64.WHITE.L1.png" }, { "Key": "EXOJUMP", - "Icon": "DS4/PS64.WHITE.R3.png" + "Icon": "DS4/PS.WHITE.CROSS.png" }, { "Key": "FE_ALT1", "Icon": "DS4/PS.WHITE.SQUARE.png" }, - { - "Key": "FE_ALT1X", - "Icon": "DS4/PS.WHITE.TRIANGLE.png" - }, { "Key": "FE_SELECT", "Icon": "DS4/PS.WHITE.CROSS.png" }, - { - "Key": "FE_SELECTX", - "Icon": "DS4/PS.WHITE.CIRCLE.png" - }, { "Key": "GALACTICMAP_SCAN", "Icon": "DS4/PS64.WHITE.L3.png" }, { "Key": "GALAXYSCAN", - "Icon": "DS4/PS64.WHITE.R3.png" + "Icon": "DS4/PS64.WHITE.L3.png" }, { "Key": "INVENTORY", - "Icon": "DS4/PS.WHITE.TRIANGLE.png" + "Icon": "DS4/PSBUTTON64.TOUCHPAD.png" }, { "Key": "JUMP", @@ -296,11 +280,11 @@ }, { "Key": "PIN", - "Icon": "DS4/PS64.WHITE.R3.png" + "Icon": "DS4/PS.WHITE.TRIANGLE.png" }, { "Key": "PIN_BUILD", - "Icon": "PS5/PS5.OPTIONS.png" + "Icon": "DS4/PS64.WHITE.R3.png" }, { "Key": "PLAYER_DECONSTRUCT", @@ -326,6 +310,10 @@ "Key": "QUICK_MENU", "Icon": "DS4/PSBUTTON.DPADDOWN.png" }, + { + "Key": "REPAIR", + "Icon": "DS4/PS.WHITE.CROSS.png" + }, { "Key": "SCAN", "Icon": "DS4/PS64.WHITE.L3.png" @@ -356,7 +344,7 @@ }, { "Key": "SHIPZOOM", - "Icon": "DS4/PSBUTTON64.TOUCHPAD.png" + "Icon": "DS4/PS64.WHITE.R3.png" }, { "Key": "SLASH", @@ -368,15 +356,19 @@ }, { "Key": "SURVEYFILTERL", - "Icon": "DS4/PS64.WHITE.R3.png" + "Icon": "DS4/PSBUTTON.DPADLEFT.png" }, { "Key": "SURVEYFILTERR", - "Icon": "DS4/PSBUTTON.DPADLEFT.png" + "Icon": "DS4/PSBUTTON.DPADRIGHT.png" + }, + { + "Key": "TELEPORT_AIM", + "Icon": "" }, { "Key": "THRUST", - "Icon": "DS4/PS64.WHITE.L2.png" + "Icon": "" }, { "Key": "UI_TOGGLETRADEINVENTORY", @@ -396,7 +388,7 @@ }, { "Key": "VEHICLESCAN", - "Icon": "DS4/PS64.WHITE.L1.png" + "Icon": "DS4/PS64.WHITE.L3.png" }, { "Key": "VEHICLETHRUST", @@ -442,7 +434,7 @@ }, { "Key": "BUILD_SNAPPING", - "Icon": "XBOX/XBOX.WHITE.Y.png" + "Icon": "XBOX/XBOX.WHITE.DPADDOWN.png" }, { "Key": "CYCLEALTWEAPON", @@ -458,39 +450,31 @@ }, { "Key": "EXOBOOST", - "Icon": "XBOX/XBOX.WHITE.A.png" + "Icon": "XBOX/XBOX.WHITE.LB.png" }, { "Key": "EXOJUMP", - "Icon": "XBOX/XBOX.WHITE.RSPUSH.png" + "Icon": "XBOX/XBOX.WHITE.A.png" }, { "Key": "FE_ALT1", "Icon": "XBOX/XBOX.WHITE.X.png" }, - { - "Key": "FE_ALT1X", - "Icon": "XBOX/XBOX.WHITE.Y.png" - }, { "Key": "FE_SELECT", "Icon": "XBOX/XBOX.WHITE.A.png" }, - { - "Key": "FE_SELECTX", - "Icon": "XBOX/XBOX.WHITE.B.png" - }, { "Key": "GALACTICMAP_SCAN", "Icon": "XBOX/XBOX.WHITE.LSPUSH.png" }, { "Key": "GALAXYSCAN", - "Icon": "XBOX/XBOX.WHITE.RSPUSH.png" + "Icon": "XBOX/XBOX.WHITE.LSPUSH.png" }, { "Key": "INVENTORY", - "Icon": "XBOX/XBOX.WHITE.Y.png" + "Icon": "XBOX/XBOXONE.WHITE.BACK.png" }, { "Key": "JUMP", @@ -498,11 +482,11 @@ }, { "Key": "PIN", - "Icon": "XBOX/XBOX.WHITE.RSPUSH.png" + "Icon": "XBOX/XBOX.WHITE.Y.png" }, { "Key": "PIN_BUILD", - "Icon": "XBOX/XBOXONE.WHITE.START.png" + "Icon": "XBOX/XBOX.WHITE.RSPUSH.png" }, { "Key": "PLAYER_DECONSTRUCT", @@ -528,6 +512,10 @@ "Key": "QUICK_MENU", "Icon": "XBOX/XBOX.WHITE.DPADDOWN.png" }, + { + "Key": "REPAIR", + "Icon": "XBOX/XBOX.WHITE.A.png" + }, { "Key": "SCAN", "Icon": "XBOX/XBOX.WHITE.LSPUSH.png" @@ -558,7 +546,7 @@ }, { "Key": "SHIPZOOM", - "Icon": "XBOX/XBOXONE.WHITE.BACK.png" + "Icon": "XBOX/XBOX.WHITE.RSPUSH.png" }, { "Key": "SLASH", @@ -570,11 +558,15 @@ }, { "Key": "SURVEYFILTERL", - "Icon": "XBOX/XBOX.WHITE.RSPUSH.png" + "Icon": "XBOX/XBOX.WHITE.DPADLEFT.png" }, { "Key": "SURVEYFILTERR", - "Icon": "XBOX/XBOX.WHITE.DPADLEFT.png" + "Icon": "XBOX/XBOX.WHITE.DPADRIGHT.png" + }, + { + "Key": "TELEPORT_AIM", + "Icon": "" }, { "Key": "THRUST", @@ -598,7 +590,7 @@ }, { "Key": "VEHICLESCAN", - "Icon": "XBOX/XBOX.WHITE.LB.png" + "Icon": "XBOX/XBOX.WHITE.LSPUSH.png" }, { "Key": "VEHICLETHRUST", @@ -644,7 +636,7 @@ }, { "Key": "BUILD_SNAPPING", - "Icon": "SWITCH/SWITCH.WHITE.Y.png" + "Icon": "SWITCH/SWITCH.WHITE.ARROWDOWN.png" }, { "Key": "CYCLEALTWEAPON", @@ -660,39 +652,31 @@ }, { "Key": "EXOBOOST", - "Icon": "SWITCH/SWITCH.WHITE.A.png" + "Icon": "SWITCH/SWITCH.WHITE.LEFTTRIGGER.png" }, { "Key": "EXOJUMP", - "Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png" + "Icon": "SWITCH/SWITCH.WHITE.A.png" }, { "Key": "FE_ALT1", "Icon": "SWITCH/SWITCH.WHITE.X.png" }, - { - "Key": "FE_ALT1X", - "Icon": "SWITCH/SWITCH.WHITE.Y.png" - }, { "Key": "FE_SELECT", "Icon": "SWITCH/SWITCH.WHITE.A.png" }, - { - "Key": "FE_SELECTX", - "Icon": "SWITCH/SWITCH.WHITE.B.png" - }, { "Key": "GALACTICMAP_SCAN", "Icon": "SWITCH/SWITCH.WHITE.PADLEFTPRESS.png" }, { "Key": "GALAXYSCAN", - "Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png" + "Icon": "SWITCH/SWITCH.WHITE.PADLEFTPRESS.png" }, { "Key": "INVENTORY", - "Icon": "SWITCH/SWITCH.WHITE.Y.png" + "Icon": "SWITCH/SWITCH.WHITE.MINUS.png" }, { "Key": "JUMP", @@ -700,11 +684,11 @@ }, { "Key": "PIN", - "Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png" + "Icon": "SWITCH/SWITCH.WHITE.Y.png" }, { "Key": "PIN_BUILD", - "Icon": "SWITCH/SWITCH.WHITE.PLUS.png" + "Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png" }, { "Key": "PLAYER_DECONSTRUCT", @@ -730,6 +714,10 @@ "Key": "QUICK_MENU", "Icon": "SWITCH/SWITCH.WHITE.ARROWDOWN.png" }, + { + "Key": "REPAIR", + "Icon": "SWITCH/SWITCH.WHITE.A.png" + }, { "Key": "SCAN", "Icon": "SWITCH/SWITCH.WHITE.PADLEFTPRESS.png" @@ -760,7 +748,7 @@ }, { "Key": "SHIPZOOM", - "Icon": "SWITCH/SWITCH.WHITE.MINUS.png" + "Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png" }, { "Key": "SLASH", @@ -772,11 +760,15 @@ }, { "Key": "SURVEYFILTERL", - "Icon": "SWITCH/SWITCH.WHITE.PADRIGHTPRESS.png" + "Icon": "SWITCH/SWITCH.WHITE.ARROWLEFT.png" }, { "Key": "SURVEYFILTERR", - "Icon": "SWITCH/SWITCH.WHITE.ARROWLEFT.png" + "Icon": "SWITCH/SWITCH.WHITE.ARROWRIGHT.png" + }, + { + "Key": "TELEPORT_AIM", + "Icon": "" }, { "Key": "THRUST", @@ -800,7 +792,7 @@ }, { "Key": "VEHICLESCAN", - "Icon": "SWITCH/SWITCH.WHITE.LEFTTRIGGER.png" + "Icon": "SWITCH/SWITCH.WHITE.PADLEFTPRESS.png" }, { "Key": "VEHICLETHRUST", diff --git a/assets/json/de/Buildings.lang.json b/assets/json/de/Buildings.lang.json index 3712b4c3..b2097353 100644 --- a/assets/json/de/Buildings.lang.json +++ b/assets/json/de/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/de/Others.lang.json b/assets/json/de/Others.lang.json index c91b91c2..855070ac 100644 --- a/assets/json/de/Others.lang.json +++ b/assets/json/de/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/en/Buildings.lang.json b/assets/json/en/Buildings.lang.json index bc850724..918c2f45 100644 --- a/assets/json/en/Buildings.lang.json +++ b/assets/json/en/Buildings.lang.json @@ -9045,8 +9045,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18500,8 +18499,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18802,7 +18800,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19087,7 +19086,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -20085,8 +20085,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/en/Others.lang.json b/assets/json/en/Others.lang.json index b8dc1247..7ab17f30 100644 --- a/assets/json/en/Others.lang.json +++ b/assets/json/en/Others.lang.json @@ -3417,8 +3417,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3440,7 +3439,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4641,7 +4641,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5583,8 +5584,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5672,8 +5672,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6872,7 +6871,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/en/TechnologyModule.lang.json b/assets/json/en/TechnologyModule.lang.json index 476664bd..2873d931 100644 --- a/assets/json/en/TechnologyModule.lang.json +++ b/assets/json/en/TechnologyModule.lang.json @@ -7531,6 +7531,7 @@ }, { "Id": "tMod178", + "Icon": "other/404.png", "Name": "Exosuit", "Group": "Salvaged Upgrade Components", "Description": "A salvaged<> upgrade for Exosuit<>. Use FE_ALT1<><> to begin upgrade installation process<>.\n\nConstructed by the Autophage<>, this technology package is the result of a high degree of engineering improvisation. As a one-of-kind piece of repurposed technology, its exact effect upon suit performance is hard to determine to predict prior to installation within the Exosuit's systems.", diff --git a/assets/json/es-la/Buildings.lang.json b/assets/json/es-la/Buildings.lang.json index d1544b18..59e1b983 100644 --- a/assets/json/es-la/Buildings.lang.json +++ b/assets/json/es-la/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/es-la/Others.lang.json b/assets/json/es-la/Others.lang.json index 93820cec..6bffe73d 100644 --- a/assets/json/es-la/Others.lang.json +++ b/assets/json/es-la/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/es/Buildings.lang.json b/assets/json/es/Buildings.lang.json index 4d0e6605..3b774ea0 100644 --- a/assets/json/es/Buildings.lang.json +++ b/assets/json/es/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/es/Others.lang.json b/assets/json/es/Others.lang.json index f838053d..9183e936 100644 --- a/assets/json/es/Others.lang.json +++ b/assets/json/es/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/fr/Buildings.lang.json b/assets/json/fr/Buildings.lang.json index a2323b99..ef3501d4 100644 --- a/assets/json/fr/Buildings.lang.json +++ b/assets/json/fr/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/fr/Others.lang.json b/assets/json/fr/Others.lang.json index d1a5221c..bbd0b4bf 100644 --- a/assets/json/fr/Others.lang.json +++ b/assets/json/fr/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/it/Buildings.lang.json b/assets/json/it/Buildings.lang.json index 01acb668..739cd076 100644 --- a/assets/json/it/Buildings.lang.json +++ b/assets/json/it/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/it/Others.lang.json b/assets/json/it/Others.lang.json index 452e6762..3fb63a14 100644 --- a/assets/json/it/Others.lang.json +++ b/assets/json/it/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/ja/Buildings.lang.json b/assets/json/ja/Buildings.lang.json index 0d2c6aa4..9ccb4098 100644 --- a/assets/json/ja/Buildings.lang.json +++ b/assets/json/ja/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/ja/Others.lang.json b/assets/json/ja/Others.lang.json index 66eccfce..38d7da50 100644 --- a/assets/json/ja/Others.lang.json +++ b/assets/json/ja/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/ko/Buildings.lang.json b/assets/json/ko/Buildings.lang.json index 15c40495..6e160fd0 100644 --- a/assets/json/ko/Buildings.lang.json +++ b/assets/json/ko/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/ko/Others.lang.json b/assets/json/ko/Others.lang.json index 1fcfb2a5..a387b42f 100644 --- a/assets/json/ko/Others.lang.json +++ b/assets/json/ko/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/nl/Buildings.lang.json b/assets/json/nl/Buildings.lang.json index 42b51a8e..59d134fa 100644 --- a/assets/json/nl/Buildings.lang.json +++ b/assets/json/nl/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/nl/Others.lang.json b/assets/json/nl/Others.lang.json index 92d22283..4d7fbffb 100644 --- a/assets/json/nl/Others.lang.json +++ b/assets/json/nl/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/pl/Buildings.lang.json b/assets/json/pl/Buildings.lang.json index 50c998d1..435bf1aa 100644 --- a/assets/json/pl/Buildings.lang.json +++ b/assets/json/pl/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/pl/Others.lang.json b/assets/json/pl/Others.lang.json index 19f7c583..02a96b64 100644 --- a/assets/json/pl/Others.lang.json +++ b/assets/json/pl/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/pt-br/Buildings.lang.json b/assets/json/pt-br/Buildings.lang.json index 88ca48b4..04caf06d 100644 --- a/assets/json/pt-br/Buildings.lang.json +++ b/assets/json/pt-br/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/pt-br/Others.lang.json b/assets/json/pt-br/Others.lang.json index 94860f64..06327a92 100644 --- a/assets/json/pt-br/Others.lang.json +++ b/assets/json/pt-br/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/pt/Buildings.lang.json b/assets/json/pt/Buildings.lang.json index b9e8700b..a6e19dd2 100644 --- a/assets/json/pt/Buildings.lang.json +++ b/assets/json/pt/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/pt/Others.lang.json b/assets/json/pt/Others.lang.json index c18d495b..41e3e9c4 100644 --- a/assets/json/pt/Others.lang.json +++ b/assets/json/pt/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/ru/Buildings.lang.json b/assets/json/ru/Buildings.lang.json index 3379a803..c8c21b9f 100644 --- a/assets/json/ru/Buildings.lang.json +++ b/assets/json/ru/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/ru/Others.lang.json b/assets/json/ru/Others.lang.json index f4f04d14..2a77fe32 100644 --- a/assets/json/ru/Others.lang.json +++ b/assets/json/ru/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/zh-hans/Buildings.lang.json b/assets/json/zh-hans/Buildings.lang.json index cf6359b1..dadf21db 100644 --- a/assets/json/zh-hans/Buildings.lang.json +++ b/assets/json/zh-hans/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/zh-hans/Others.lang.json b/assets/json/zh-hans/Others.lang.json index 93e59199..b5c591af 100644 --- a/assets/json/zh-hans/Others.lang.json +++ b/assets/json/zh-hans/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/zh-hant/Buildings.lang.json b/assets/json/zh-hant/Buildings.lang.json index 52963ab6..3c79914c 100644 --- a/assets/json/zh-hant/Buildings.lang.json +++ b/assets/json/zh-hant/Buildings.lang.json @@ -8936,8 +8936,7 @@ "HasDevProperties", "IsQuicksilver", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18391,8 +18390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason8Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18693,7 +18691,8 @@ "Usages": [ "HasDevProperties", "IsQuicksilver", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -18978,7 +18977,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason7Reward" + "IsExpeditionSeason7Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -19976,8 +19976,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason6Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/assets/json/zh-hant/Others.lang.json b/assets/json/zh-hant/Others.lang.json index 72258dfc..0313beda 100644 --- a/assets/json/zh-hant/Others.lang.json +++ b/assets/json/zh-hant/Others.lang.json @@ -3390,8 +3390,7 @@ "HasDevProperties", "IsAddedInTrackedUpdate", "IsExpeditionSeason5Reward", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -3413,7 +3412,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason5Reward" + "IsExpeditionSeason5Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -4614,7 +4614,8 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsExpeditionSeason8Reward" + "IsExpeditionSeason8Reward", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5556,8 +5557,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -5645,8 +5645,7 @@ "Usages": [ "HasDevProperties", "IsAddedInTrackedUpdate", - "IsTwitchCampaign6Reward", - "IsTwitchCampaign7Reward" + "IsTwitchCampaign6Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", @@ -6845,7 +6844,8 @@ "Colour": "2C7C9F", "Usages": [ "HasDevProperties", - "IsAddedInTrackedUpdate" + "IsAddedInTrackedUpdate", + "IsTwitchCampaign7Reward" ], "BlueprintCost": 1, "BlueprintCostType": "None", diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 4b49e982..4820c508 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -9,9 +9,6 @@ #include #include #include -#include -#include -#include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_registrar = @@ -23,13 +20,4 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_localization_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLocalizationPlugin"); flutter_localization_plugin_register_with_registrar(flutter_localization_registrar); - g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); - flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); - g_autoptr(FlPluginRegistrar) platform_device_id_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "PlatformDeviceIdLinuxPlugin"); - platform_device_id_linux_plugin_register_with_registrar(platform_device_id_linux_registrar); - g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); - url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index bc7ae6d1..0483c278 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -6,9 +6,6 @@ list(APPEND FLUTTER_PLUGIN_LIST bitsdojo_window_linux dynamic_color flutter_localization - flutter_secure_storage_linux - platform_device_id_linux - url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 9a78c6f0..ae2c745c 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,16 +17,9 @@ import firebase_messaging import flutter_local_notifications import flutter_localization import flutter_native_timezone -import flutter_secure_storage_macos import macos_ui -import package_info_plus import path_provider_foundation -import platform_device_id -import platform_device_id_macos -import share_plus import shared_preferences_foundation -import sqflite -import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AssetsAudioPlayerPlugin.register(with: registry.registrar(forPlugin: "AssetsAudioPlayerPlugin")) @@ -41,14 +34,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin")) FlutterNativeTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterNativeTimezonePlugin")) - FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) - PlatformDeviceIdMacosPlugin.register(with: registry.registrar(forPlugin: "PlatformDeviceIdMacosPlugin")) - PlatformDeviceIdMacosPlugin.register(with: registry.registrar(forPlugin: "PlatformDeviceIdMacosPlugin")) - SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) - SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) - UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 68c94a40..170667a1 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -10,10 +10,6 @@ #include #include #include -#include -#include -#include -#include void RegisterPlugins(flutter::PluginRegistry* registry) { BitsdojoWindowPluginRegisterWithRegistrar( @@ -24,12 +20,4 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DynamicColorPluginCApi")); FlutterLocalizationPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterLocalizationPluginCApi")); - FlutterSecureStorageWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); - PlatformDeviceIdWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("PlatformDeviceIdWindowsPlugin")); - SharePlusWindowsPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); - UrlLauncherWindowsRegisterWithRegistrar( - registry->GetRegistrarForPlugin("UrlLauncherWindows")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index c1528fc2..456c4f7a 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -7,10 +7,6 @@ list(APPEND FLUTTER_PLUGIN_LIST connectivity_plus dynamic_color flutter_localization - flutter_secure_storage_windows - platform_device_id_windows - share_plus - url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST From 29fac2f6f9350e1463bfe3e7ff7cbad6f5f6b660 Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Thu, 24 Aug 2023 21:51:56 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=94=96=202.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux/flutter/generated_plugin_registrant.cc | 12 ++ linux/flutter/generated_plugins.cmake | 3 + macos/Flutter/GeneratedPluginRegistrant.swift | 14 ++ pubspec.lock | 138 ++++++++---------- pubspec.yaml | 2 +- .../flutter/generated_plugin_registrant.cc | 12 ++ windows/flutter/generated_plugins.cmake | 4 + 7 files changed, 107 insertions(+), 78 deletions(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 4820c508..4b49e982 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -9,6 +9,9 @@ #include #include #include +#include +#include +#include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_registrar = @@ -20,4 +23,13 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_localization_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLocalizationPlugin"); flutter_localization_plugin_register_with_registrar(flutter_localization_registrar); + g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); + flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); + g_autoptr(FlPluginRegistrar) platform_device_id_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "PlatformDeviceIdLinuxPlugin"); + platform_device_id_linux_plugin_register_with_registrar(platform_device_id_linux_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 0483c278..bc7ae6d1 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST bitsdojo_window_linux dynamic_color flutter_localization + flutter_secure_storage_linux + platform_device_id_linux + url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index ae2c745c..9a78c6f0 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,9 +17,16 @@ import firebase_messaging import flutter_local_notifications import flutter_localization import flutter_native_timezone +import flutter_secure_storage_macos import macos_ui +import package_info_plus import path_provider_foundation +import platform_device_id +import platform_device_id_macos +import share_plus import shared_preferences_foundation +import sqflite +import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AssetsAudioPlayerPlugin.register(with: registry.registrar(forPlugin: "AssetsAudioPlayerPlugin")) @@ -34,7 +41,14 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin")) FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin")) FlutterNativeTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterNativeTimezonePlugin")) + FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + PlatformDeviceIdMacosPlugin.register(with: registry.registrar(forPlugin: "PlatformDeviceIdMacosPlugin")) + PlatformDeviceIdMacosPlugin.register(with: registry.registrar(forPlugin: "PlatformDeviceIdMacosPlugin")) + SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) + UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index e64130ea..ab994144 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -310,10 +310,10 @@ packages: dependency: transitive description: name: cross_file - sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" url: "https://pub.dev" source: hosted - version: "0.3.3+2" + version: "0.3.3+4" crypto: dependency: transitive description: @@ -366,10 +366,10 @@ packages: dependency: transitive description: name: dio - sha256: "3709d74615bba5e443eb141f6a7f4bcc4788f8fae6f743edadfb79c2a8e6287e" + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.3.2" dots_indicator: dependency: "direct main" description: @@ -595,10 +595,10 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.3.1" flutter_chip_tags: dependency: transitive description: @@ -914,34 +914,34 @@ packages: dependency: transitive description: name: image_picker_android - sha256: "822f71a53336bf1e638dbf955047080ca49ba0197f52c4fece9cf584c368648a" + sha256: "8179b54039b50eee561676232304f487602e2950ffb3e8995ed9034d6505ca34" url: "https://pub.dev" source: hosted - version: "0.8.5+3" + version: "0.8.7+4" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "7d319fb74955ca46d9bf7011497860e3923bb67feebcf068f489311065863899" + sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0" url: "https://pub.dev" source: hosted - version: "2.1.10" + version: "2.2.0" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: "1768087441bd69ca632249d212c26fa8d530552d37b4896a4dd8d6781435c147" + sha256: bee3b7c7e6266a37fb1bfdc275bc60427029d447205d44933aac130fbb9d3330 url: "https://pub.dev" source: hosted - version: "0.8.6+1" + version: "0.8.8+1" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - sha256: "7cef2f28f4f2fef99180f636c3d446b4ccbafd6ba0fad2adc9a80c4040f656b8" + sha256: c1134543ae2187e85299996d21c526b2f403854994026d575ae4cf30d7bb2a32 url: "https://pub.dev" source: hosted - version: "2.6.2" + version: "2.9.0" intersperse: dependency: transitive description: @@ -994,10 +994,10 @@ packages: dependency: transitive description: name: logging - sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" macos_ui: dependency: transitive description: @@ -1010,10 +1010,10 @@ packages: dependency: transitive description: name: markdown - sha256: b3c60dee8c2af50ad0e6e90cceba98e47718a6ee0a7a6772c77846a0cc21f78b + sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.1.1" marquee_vertical: dependency: "direct main" description: @@ -1026,18 +1026,18 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "586678f20e112219ed0f73215f01bcdf1d769824ba2ebae45ad918a9bfde9bdb" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.3.0" material_segmented_control: dependency: transitive description: @@ -1066,10 +1066,10 @@ packages: dependency: transitive description: name: mime - sha256: dab22e92b41aa1255ea90ddc4bc2feaf35544fd0728e209638cad041a6e3928a + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.4" msix: dependency: "direct dev" description: @@ -1206,14 +1206,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.3" - pedantic: - dependency: transitive - description: - name: pedantic - sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" - url: "https://pub.dev" - source: hosted - version: "1.11.1" percent_indicator: dependency: transitive description: @@ -1322,10 +1314,10 @@ packages: dependency: transitive description: name: provider - sha256: e1e7413d70444ea3096815a60fe5da1b11bda8a9dc4769252cc82c53536f8bcc + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f url: "https://pub.dev" source: hosted - version: "6.0.4" + version: "6.0.5" pub_semver: dependency: transitive description: @@ -1420,10 +1412,10 @@ packages: dependency: transitive description: name: share_plus_platform_interface - sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1" + sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" shared_preferences: dependency: transitive description: @@ -1529,18 +1521,18 @@ packages: dependency: transitive description: name: sqflite - sha256: d21c022832f139b89922738e200c07387a49c549bf36c35654418e19ff76d161 + sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" url: "https://pub.dev" source: hosted - version: "2.2.0+3" + version: "2.3.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "0c21a187d645aa65da5be6997c0c713eed61e049158870ae2de157e6897067ab" + sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a" url: "https://pub.dev" source: hosted - version: "2.4.0+2" + version: "2.5.0" sse_client: dependency: transitive description: @@ -1609,10 +1601,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "7b530acd9cb7c71b0019a1e7fa22c4105e675557a4400b6a401c71c5e0ade1ac" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" url: "https://pub.dev" source: hosted - version: "3.0.0+3" + version: "3.1.0" talker: dependency: transitive description: @@ -1657,10 +1649,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.5.1" time_formatter: dependency: transitive description: @@ -1690,10 +1682,10 @@ packages: dependency: transitive description: name: tuple - sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa" + sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" typed_data: dependency: transitive description: @@ -1722,58 +1714,58 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "2514dc16ac169adf55159268d7bf70317d9f2fc9ef5bb02020bb7ad710c0aeb4" + sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025" url: "https://pub.dev" source: hosted - version: "6.0.21" + version: "6.0.38" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "6ba7dddee26c9fae27c9203c424631109d73c8fa26cfa7bc3e35e751cb87f62e" + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" url: "https://pub.dev" source: hosted - version: "6.0.17" + version: "6.1.4" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "360fa359ab06bcb4f7c5cd3123a2a9a4d3364d4575d27c4b33468bd4497dd094" + sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.5" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: a9b3ea9043eabfaadfa3fb89de67a11210d85569086d22b3854484beab8b3978 + sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.6" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6" + sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.3" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "5669882643b96bb6d5786637cac727c6e918a790053b09245fd4513b8a07df2a" + sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 url: "https://pub.dev" source: hosted - version: "2.0.13" + version: "2.0.18" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: e3c3b16d3104260c10eea3b0e34272aaa57921f83148b0619f74c2eced9b7ef1 + sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.7" uuid: dependency: transitive description: @@ -1794,26 +1786,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "4cf8e60dbe4d3a693d37dff11255a172594c0793da542183cbfe7fe978ae4aaa" + sha256: ea8d3fc7b2e0f35de38a7465063ecfcf03d8217f7962aa2a6717132cb5d43a79 url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.5" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: "278ad5f816f58b1967396d1f78ced470e3e58c9fe4b27010102c0a595c764468" + sha256: a5eaa5d19e123ad4f61c3718ca1ed921c4e6254238d9145f82aa214955d9aced url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.5" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "0bf61ad56e6fd6688a2865d3ceaea396bc6a0a90ea0d7ad5049b1b76c09d6163" + sha256: "15edc42f7eaa478ce854eaf1fbb9062a899c0e4e56e775dd73b7f4709c97c4ca" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.1.5" vector_math: dependency: transitive description: @@ -1830,22 +1822,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.3" - web: - dependency: transitive - description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 - url: "https://pub.dev" - source: hosted - version: "0.1.4-beta" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.0" websafe_svg: dependency: transitive description: @@ -1887,5 +1871,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.1.0-15.0.dev <4.0.0" flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index 8db69b32..12b5d2b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: assistantnms_app description: Assistant for No Man's Sky homepage: https://nmsassistant.com # author: Kurt Lourens -version: 2.17.0+319 # dart scripts\version_num_script.dart +version: 2.17.1+320 # dart scripts\version_num_script.dart publish_to: 'none' environment: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 170667a1..68c94a40 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -10,6 +10,10 @@ #include #include #include +#include +#include +#include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { BitsdojoWindowPluginRegisterWithRegistrar( @@ -20,4 +24,12 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("DynamicColorPluginCApi")); FlutterLocalizationPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterLocalizationPluginCApi")); + FlutterSecureStorageWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); + PlatformDeviceIdWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PlatformDeviceIdWindowsPlugin")); + SharePlusWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 456c4f7a..c1528fc2 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -7,6 +7,10 @@ list(APPEND FLUTTER_PLUGIN_LIST connectivity_plus dynamic_color flutter_localization + flutter_secure_storage_windows + platform_device_id_windows + share_plus + url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST From 18c2009dfbd316b5e440fa4d99ce1f4c8b81354b Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Thu, 24 Aug 2023 21:52:26 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=94=96=202.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installers/assistantNMS.iss | 2 +- lib/env/app_version_num.dart | 6 +++--- pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installers/assistantNMS.iss b/installers/assistantNMS.iss index 5739bace..e831e956 100644 --- a/installers/assistantNMS.iss +++ b/installers/assistantNMS.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Assistant for No Man's Sky" -#define MyAppVersion "2.17.0" +#define MyAppVersion "2.17.1" #define MyAppPublisher "AssistantApps" #define MyAppURL "https://nmsassistant.com/" #define MyAppExeName "assistantnms_app.exe" diff --git a/lib/env/app_version_num.dart b/lib/env/app_version_num.dart index ffc1f712..bd33e1cd 100644 --- a/lib/env/app_version_num.dart +++ b/lib/env/app_version_num.dart @@ -1,3 +1,3 @@ -const appsBuildNum = 319; -const appsBuildName = '2.17.0'; -const appsCommit = '7fd3ec0621cfb9b87c32e669d64927642e6e1d06'; \ No newline at end of file +const appsBuildNum = 320; +const appsBuildName = '2.17.1'; +const appsCommit = '29fac2f6f9350e1463bfe3e7ff7cbad6f5f6b660'; \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 12b5d2b7..095b49cf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -97,7 +97,7 @@ flutter_icons: ## flutter pub run flutter_launcher_icons:main msix_config: # https://pub.dev/documentation/msix/latest/ display_name: Assistant for No Man's Sky publisher_display_name: AssistantApps - msix_version: 2.17.0.0 + msix_version: 2.17.1.0 identity_name: notSureIfSecret publisher: notSureIfSecret logo_path: './assets/images/fullSizeIcon.png'