Update for modhub

Roby1164 · May 6, 2020 · e3f1e72 · e3f1e72
1 parent 19ab3c4
commit e3f1e72
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 43 deletions.
diff --git a/GlobalCompany.lua b/GlobalCompany.lua
@@ -4,14 +4,17 @@
 -- @Interface: 1.5.1.0 b6730
 -- @Author: LS-Modcompany
 -- @Date: 29.04.2020
--- @Version: 1.4.5.1
+-- @Version: 1.5.0.0
 --
 -- @Support: LS-Modcompany
 --
 -- Changelog:
+-- 	v1.5.0.0 (29.04.2020):
+--		- Fix Baler
+--
 -- 	v1.4.4.0 (18.04.2020):
 --		- Some Bugfixes
-
+--
 -- 	v1.4.3.0 (02.04.2020):
 --		- FarmStart: Add 'boughtWithFarmland' attribute for items
 --
@@ -109,10 +112,10 @@
 GlobalCompany = {};
 GlobalCompany.dir = g_currentModDirectory;
 
-GlobalCompany.version = "1.4.5.1";
+GlobalCompany.version = "1.5.0.0";
 GlobalCompany.versionDate = "29.04.2020";
-GlobalCompany.currentVersionId = 1451; -- Mod Manager ID. (Version number without periods.)
-GlobalCompany.isDevelopmentVersion = true; -- This is for versions loaded from GIT.
+GlobalCompany.currentVersionId = 1500; -- Mod Manager ID. (Version number without periods.)
+GlobalCompany.isDevelopmentVersion = false; -- This is for versions loaded from GIT.
 GlobalCompany.isGreenWeekVersion = false;
 
 function GlobalCompany.initialLoad()

diff --git a/globalCompany.dds b/globalCompany.dds
diff --git a/images/ui_elements_2.dds b/images/ui_elements_2.dds
diff --git a/languages/l10n_de.xml b/languages/l10n_de.xml
@@ -48,8 +48,8 @@
 		<e k="GC_gui_deactivate" v="Ausschalten"/>
 		<e k="GC_gui_state" v="Status:"/>
 		<e k="GC_gui_automatic" v="Automatik:"/>
-		<e k="GC_gui_state_on" v="läuft"/>
-		<e k="GC_gui_state_off" v="gestoppt"/>
+		<e k="GC_gui_state_on" v="Läuft"/>
+		<e k="GC_gui_state_off" v="Gestoppt"/>
 		<e k="GC_gui_pallet1" v="%s Palette"/>
 		<e k="GC_gui_pallet2" v="%s Paletten"/>
 		<e k="GC_gui_spawnText1" v="%s Palette erzeugen"/>
@@ -79,11 +79,11 @@
 
 		<e k="GC_gui_factories" v="Produktionen"/>
 		<e k="GC_gui_activeProductLines" v="aktive Produktlinien:"/>
-		<e k="GC_gui_emptyInputs" v="leere Rohstoffe:"/>
-		<e k="GC_gui_fullOutputs" v="volle Produkte:"/>
+		<e k="GC_gui_emptyInputs" v="Leere Rohstoffe:"/>
+		<e k="GC_gui_fullOutputs" v="Volle Produkte:"/>
 
 		<e k="GC_gui_dynamicStorages" v="Dynamische Lager"/>
-		<e k="GC_gui_freeSlots" v="freie Boxen:"/>
+		<e k="GC_gui_freeSlots" v="Freie Boxen:"/>
 
 		<e k="GC_gui_placeableObject" v="Platzierbare Objekt"/>
 		<e k="GC_gui_farmlandObject" v="Farmland Objekt"/>
@@ -177,8 +177,8 @@ Kosten:  %s"/>
 		<e k="GC_globalMarket_tbl_header_level" v="Liter"/>
 		<e k="GC_globalMarket_tbl_header_pallets" v="Paletten"/>
 		<e k="GC_globalMarket_tbl_header_bales" v="Ballen"/>
-		<e k="GC_globalMarket_tbl_header_price" v="aktueller Preis"/>
-		<e k="GC_globalMarket_tbl_header_price2" v="aktueller Preis / 1000 Liter"/>
+		<e k="GC_globalMarket_tbl_header_price" v="Aktueller Preis"/>
+		<e k="GC_globalMarket_tbl_header_price2" v="Aktueller Preis / 1000 Liter"/>
 		<e k="GC_globalMarket_btn_outsource" v="Auslagern"/>
 		<e k="GC_globalMarket_btn_outsourceBale1" v="Rundballen"/>
 		<e k="GC_globalMarket_btn_outsourceBale2" v="Quaderballen"/>

diff --git a/languages/l10n_en.xml b/languages/l10n_en.xml
@@ -129,7 +129,7 @@
 		<e k="GC_dynamicStorage_gui_info_unloading" v="Choose in which box should be unloaded. Note that in each box only one fruit can be unloaded."/>
 		<e k="GC_dynamicStorage_gui_info_loading" v="Choose from which box to load."/>
 		<e k="GC_dynamicStorage_gui_fillLevel" v="%s / %s Litre"/>
-		<e k="GC_dynamicStorage_gui_empty" v="empty"/>
+		<e k="GC_dynamicStorage_gui_empty" v="Empty"/>
 		<e k="GC_dynamicStorage_gui_confirmBoxUnloading" v="Confirm unloading position"/>
 		<e k="GC_dynamicStorage_gui_confirmBoxLoading" v="Confirm charging box"/>
 
@@ -164,8 +164,8 @@
 		<e k="GC_globalMarket_tbl_header_level" v="Litres"/>
 		<e k="GC_globalMarket_tbl_header_pallets" v="Pallets"/>
 		<e k="GC_globalMarket_tbl_header_bales" v="Bales"/>
-		<e k="GC_globalMarket_tbl_header_price" v="actual Price"/>
-		<e k="GC_globalMarket_tbl_header_price2" v="actual Price / 1000 Liter"/>
+		<e k="GC_globalMarket_tbl_header_price" v="Actual Price"/>
+		<e k="GC_globalMarket_tbl_header_price2" v="Actual Price / 1000 Liter"/>
 		<e k="GC_globalMarket_btn_outsource" v="Outsource"/>
 		<e k="GC_globalMarket_btn_outsourceBale1" v="Round bale"/>
 		<e k="GC_globalMarket_btn_outsourceBale2" v="Square bale"/>

diff --git a/languages/l10n_fr.xml b/languages/l10n_fr.xml
@@ -138,7 +138,7 @@ Coût : %s"/>
 		<e k="GC_dynamicStorage_gui_info_unloading" v="Sélectionner la boîte de déchargement. Notez que chaque boîte ne peut contenir qu'un seul type de produit."/>
 		<e k="GC_dynamicStorage_gui_info_loading" v="Sélectionnez la boîte à charger."/>
 		<e k="GC_dynamicStorage_gui_fillLevel" v="%s / %s litre"/>
-		<e k="GC_dynamicStorage_gui_empty" v="vide"/>
+		<e k="GC_dynamicStorage_gui_empty" v="Vide"/>
 		<e k="GC_dynamicStorage_gui_confirmBoxUnloading" v="Confirmer la position de déchargement"/>
 		<e k="GC_dynamicStorage_gui_confirmBoxLoading" v="Confirmer le chargement"/>
 

diff --git a/languages/l10n_it.xml b/languages/l10n_it.xml
@@ -44,7 +44,7 @@
 		<e k="GC_gui_liter" v="%s Litri"/>
 		<e k="GC_gui_buyText" v="Acquisto (%s)"/>
 		<e k="GC_gui_activate" v="Attivato"/>
-		<e k="GC_gui_deactivate" v="disattivato"/>
+		<e k="GC_gui_deactivate" v="Disattivato"/>
 		<e k="GC_gui_state" v="Stato:"/>
 		<e k="GC_gui_automatic" v="Automatico:"/>
 		<e k="GC_gui_state_on" v="Avviato"/>

diff --git a/languages/l10n_nl.xml b/languages/l10n_nl.xml
@@ -47,8 +47,8 @@
 		<e k="GC_gui_deactivate" v="Uitschakelen"/>
 		<e k="GC_gui_state" v="Status:"/>
 		<e k="GC_gui_automatic" v="Automatisch:"/>
-		<e k="GC_gui_state_on" v="lopend"/>
-		<e k="GC_gui_state_off" v="gestopt"/>
+		<e k="GC_gui_state_on" v="Lopend"/>
+		<e k="GC_gui_state_off" v="Gestopt"/>
 		<e k="GC_gui_pallet1" v="%s Pallet"/>
 		<e k="GC_gui_pallet2" v="%s Palletten"/>
 		<e k="GC_gui_spawnText1" v="%s Pallet Generen"/>
@@ -77,9 +77,9 @@
 		<e k="GC_gui_changeFactoryTitle" v="Voer hieronder een nieuwe Fabrieksnaam in."/>
 
 		<e k="GC_gui_factories" v="Producties"/>
-		<e k="GC_gui_activeProductLines" v="actieve Productlijnen:"/>
-		<e k="GC_gui_emptyInputs" v="lege grondstoffen:"/>
-		<e k="GC_gui_fullOutputs" v="volledige Producten:"/>
+		<e k="GC_gui_activeProductLines" v="Actieve Productlijnen:"/>
+		<e k="GC_gui_emptyInputs" v="Lege grondstoffen:"/>
+		<e k="GC_gui_fullOutputs" v="Volledige Producten:"/>
 
 		<e k="GC_gui_dynamicStorages" v="Dynamische Lagers"/>
 		<e k="GC_gui_freeSlots" v="Vrije Vakken:"/>
@@ -173,13 +173,13 @@ Kosten: %s"/>
 		<e k="GC_globalMarket_tbl_header_level" v="Liter"/>
 		<e k="GC_globalMarket_tbl_header_pallets" v="Pallets"/>
 		<e k="GC_globalMarket_tbl_header_bales" v="Balen"/>
-		<e k="GC_globalMarket_tbl_header_price" v="werkelijke prijs"/>
-		<e k="GC_globalMarket_tbl_header_price2" v="werkelijke prijs / 1000 Liter"/>
+		<e k="GC_globalMarket_tbl_header_price" v="Werkelijke prijs"/>
+		<e k="GC_globalMarket_tbl_header_price2" v="Werkelijke prijs / 1000 Liter"/>
 		<e k="GC_globalMarket_btn_outsource" v="Uitgaand"/>
 		<e k="GC_globalMarket_btn_outsourceBale1" v="Ronde baal"/>
 		<e k="GC_globalMarket_btn_outsourceBale2" v="Vierkante baal"/>
-		<e k="GC_globalMarket_btn_sell" v="verkopen"/>
-		<e k="GC_globalMarket_btn_buy" v="kopen"/>
+		<e k="GC_globalMarket_btn_sell" v="Verkopen"/>
+		<e k="GC_globalMarket_btn_buy" v="Kopen"/>
 
 		<e k="GC_globalMarket_tbl_header_preview" v="Voorbeeld"/>
 		<e k="GC_globalMarket_tbl_header_name" v="Naam"/>

diff --git a/languages/l10n_pl.xml b/languages/l10n_pl.xml
@@ -138,7 +138,7 @@ Koszt: %s"/>
 		<e k="GC_dynamicStorage_gui_info_unloading" v="Wybierz, którą skrzynkę należy rozładować. Pamiętaj, że każdą skrzynkę można rozładować tylko jednym ładunkiem."/>
 		<e k="GC_dynamicStorage_gui_info_loading" v="Wybierz, którą skrzynkę chcesz załadować."/>
 		<e k="GC_dynamicStorage_gui_fillLevel" v="%s / %s l"/>
-		<e k="GC_dynamicStorage_gui_empty" v="pusty"/>
+		<e k="GC_dynamicStorage_gui_empty" v="Pusty"/>
 		<e k="GC_dynamicStorage_gui_confirmBoxUnloading" v="Potwierdź pozycję rozładunku"/>
 		<e k="GC_dynamicStorage_gui_confirmBoxLoading" v="Potwierdź skrzynkę do załadunku"/>
 

diff --git a/modDesc.xml b/modDesc.xml
@@ -2,7 +2,7 @@
 <modDesc descVersion="47">
 	<author>LS-Modcompany / kevink98, aPuehri, Eribus</author>
 
-    <version>1.4.5.1</version>
+    <version>1.5.0.0</version>
 
 	<title>
         <en>GlobalCompany</en>
@@ -16,6 +16,9 @@ GlobalCompany is the base for many scripts. No matter if production, warehouse o
 Changelog 1.5.0.0:
 - NEW: GloblaMarket: Add Feature for create own private servers
 - NEW: FarmerStart
+- NEW: Some Improvements
+- FIX: Baler
+- FIX: Some Bugs
 
 Changelog 1.4.0.0:
 - NEW: Support of ManureHoseSystem for factory
@@ -70,9 +73,16 @@ Changelog 1.1.0.0:
 
 GlobalCompany ist die Grundlage für viele Scripte. Egal ob Produktionen, Lager oder was auch immer - hiermit lässt es sich einfach umsetzen.
 
+Changelog 1.5.0.0:
+- NEU: GloblaMarket: Erstellung von privaten Servern hinzugefügt
+- NEU: FarmerStart
+- NEU: Viele Verbesserungen
+- FIX: Baler
+- FIX: Bugs behoben
+
 Changelog 1.4.0.0:
-- NEW: Unterstützung vom ManureHoseSystem bei Fabriken (Einbau nötig, siehe Beispielmod!)
-- NEW: Programmablaufplan für Fabriken
+- NEU: Unterstützung vom ManureHoseSystem bei Fabriken (Einbau nötig, siehe Beispielmod!)
+- NEU: Programmablaufplan für Fabriken
 
 Changelog 1.3.0.0:
 - NEU: Design
@@ -123,6 +133,13 @@ Changelog 1.1.0.0:
 
 GlobalCompany основа для многих скриптов. Будь то производства, хранилища или что то еще - с ним возможно многое.
 
+Блог изменений 1.5.0.0:
+- NEW: GloblaMarket: Добавить возможность создания собственных частных серверов
+- НОВИНКА: FarmerStart
+- НОВОЕ: некоторые улучшения
+- FIX: Пресс
+- FIX: Некоторые ошибки
+
 Блог изменений 1.4.0.0:
 - НОВИНКА: Поддержка системы навозаHoseSystem для фабрики
 - НОВОЕ: Поток программ для завода
@@ -176,6 +193,13 @@ GlobalCompany основа для многих скриптов. Будь то
 
 GlobalCompany est la base de nombreux scripts. Que ce soit pour la production, l'entreposage ou autre - avec ce mod, il est facile de tout implémenter.
 
+Changelog 1.5.0.0 :
+- NOUVEAU : GloblaMarket : Ajout d'une fonctionnalité permettant de créer ses propres serveurs privés
+- NOUVEAU : FarmerStart
+- NOUVEAU : Quelques améliorations
+- CORRECTION : Presse à balles
+- CORRECTION : Quelques bugs
+
 Changelog 1.4.0.0 :
 - NOUVEAU : Support du système de tuyaux d'évacuation du fumier pour les usines
 - NOUVEAU : Programmflow pour l'usine
@@ -237,7 +261,7 @@ Changelog 1.1.0.0.0 :
     <l10n>		
 	    <text name="input_GC_MAIN"><en>GlobalCompany</en><de>GlobalCompany</de><pl>Menu GlobalCompany</pl></text>
 	    <text name="input_GC_BALEADDON_CUT"><en>Cut Bale</en><de>Ballen aufschneiden</de><pl>Rozetnij belę</pl></text>
-		<text name="input_GC_DYNSTORAGE_VEHICLEINTERACTION"><en>dynStorageVehInterAct</en></text>
+		<text name="input_GC_DYNSTORAGE_VEHICLEINTERACTION"><en>DynStorageVehInterAct</en></text>
 	</l10n>		
 
 	<actions>

diff --git a/objects/GC_GlobalMarket.lua b/objects/GC_GlobalMarket.lua
@@ -52,18 +52,18 @@ GC_GlobalMarket.baleToFilename["COTTON"] = {nil, g_company.dir .. "shop/buyableB
 
 
 GC_GlobalMarket.fillTypeToFilename = {}
-GC_GlobalMarket.fillTypeToFilename["TREESAPLINGS"] = "data/objects/pallets/treeSaplingPallet/treeSaplingPallet.xml"
-GC_GlobalMarket.fillTypeToFilename["WOOL"] = "data/objects/pallets/woolPallet/woolPallet.xml"
-GC_GlobalMarket.fillTypeToFilename["EGG"] = "data/objects/pallets/eggBox/eggBox.xml"
-GC_GlobalMarket.fillTypeToFilename["POPLAR"] = "data/objects/pallets/palletPoplar/palletPoplar.xml"
-GC_GlobalMarket.fillTypeToFilename["WOODCHIPS"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
-GC_GlobalMarket.fillTypeToFilename["SUGARBEET"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
-GC_GlobalMarket.fillTypeToFilename["FORAGE"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
-GC_GlobalMarket.fillTypeToFilename["FORAGE_MIXING"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
-GC_GlobalMarket.fillTypeToFilename["CHAFF"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
---GC_GlobalMarket.fillTypeToFilename["SILAGE"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
-GC_GlobalMarket.fillTypeToFilename["MANURE"] = "data/objects/pallets/fillablePallet/fillablePallet.xml"
-GC_GlobalMarket.fillTypeToFilename["PIGFOOD"] = "data/objects/bigBagContainer/bigBagContainerPigFood.xml"
+GC_GlobalMarket.fillTypeToFilename["TREESAPLINGS"] = "$data/objects/pallets/treeSaplingPallet/treeSaplingPallet.xml"
+GC_GlobalMarket.fillTypeToFilename["WOOL"] = "$data/objects/pallets/woolPallet/woolPallet.xml"
+GC_GlobalMarket.fillTypeToFilename["EGG"] = "$data/objects/pallets/eggBox/eggBox.xml"
+GC_GlobalMarket.fillTypeToFilename["POPLAR"] = "$data/objects/pallets/palletPoplar/palletPoplar.xml"
+GC_GlobalMarket.fillTypeToFilename["WOODCHIPS"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+GC_GlobalMarket.fillTypeToFilename["SUGARBEET"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+GC_GlobalMarket.fillTypeToFilename["FORAGE"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+GC_GlobalMarket.fillTypeToFilename["FORAGE_MIXING"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+GC_GlobalMarket.fillTypeToFilename["CHAFF"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+--GC_GlobalMarket.fillTypeToFilename["SILAGE"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+GC_GlobalMarket.fillTypeToFilename["MANURE"] = "$data/objects/pallets/fillablePallet/fillablePallet.xml"
+GC_GlobalMarket.fillTypeToFilename["PIGFOOD"] = "$data/objects/bigBagContainer/bigBagContainerPigFood.xml"
 
 GC_GlobalMarket.fillTypeMapping = {}
 GC_GlobalMarket.fillTypeMapping["GRASS"] = "GRASS_WINDROW"