From c6bb1a22fbbb0ff363a1058f4330e0ed99517618 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Sun, 20 Jun 2021 11:53:37 +0200
Subject: [PATCH 1/3] Bugfix backport

---
 src/js/game/modes/regular.js | 8 +++++++-
 src/js/states/main_menu.js   | 6 +-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/js/game/modes/regular.js b/src/js/game/modes/regular.js
index 6a939d1a..47ee1355 100644
--- a/src/js/game/modes/regular.js
+++ b/src/js/game/modes/regular.js
@@ -38,6 +38,7 @@ import { HUDInteractiveTutorial } from "../hud/parts/interactive_tutorial";
 import { HUDSandboxController } from "../hud/parts/sandbox_controller";
 import { queryParamOptions } from "../../core/query_parameters";
 import { MetaBlockBuilding } from "../buildings/block";
+import { MetaItemProducerBuilding } from "../buildings/item_producer";
 
 /** @typedef {{
  *   shape: string,
@@ -586,7 +587,12 @@ export class RegularGameMode extends GameMode {
         }
 
         /** @type {(typeof MetaBuilding)[]} */
-        this.hiddenBuildings = [MetaConstantProducerBuilding, MetaGoalAcceptorBuilding, MetaBlockBuilding];
+        this.hiddenBuildings = [
+            MetaConstantProducerBuilding,
+            MetaGoalAcceptorBuilding,
+            MetaBlockBuilding,
+            MetaItemProducerBuilding,
+        ];
     }
 
     /**
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index d1174020..79c9bab7 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -71,11 +71,7 @@ export class MainMenuState extends GameState {
 
             <div class="logo">
                 <img src="${cachebust("res/" + getLogoSprite())}" alt="shapez.io Logo">
-                ${
-                    G_WEGAME_VERSION
-                        ? ""
-                        : `<span class="updateLabel">v${G_BUILD_VERSION} - Puzzle DLC!</span>`
-                }
+                ${G_WEGAME_VERSION ? "" : `<span class="updateLabel">v${G_BUILD_VERSION}!</span>`}
             </div>
 
             <div class="mainWrapper ${showDemoBadges ? "demo" : "noDemo"}" data-columns="${

From 540b4b87426858140daf074ea60e403e90c78292 Mon Sep 17 00:00:00 2001
From: Lejo <Lejo_1@web.de>
Date: Sun, 20 Jun 2021 12:43:15 +0200
Subject: [PATCH 2/3] Fix docker image (#1213)

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 61d54684..b79cac20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ COPY translations ./translations
 COPY src/js ./src/js
 COPY res_raw ./res_raw
 COPY .git ./.git
+COPY electron ./electron
 
 WORKDIR /shapez.io/gulp
 ENTRYPOINT ["yarn", "gulp"]

From d70fa78ff282d088d063a0d00013bbe535e23c46 Mon Sep 17 00:00:00 2001
From: Intron014 <jbenjumeaburillo@gmail.com>
Date: Sun, 20 Jun 2021 12:43:29 +0200
Subject: [PATCH 3/3] Update base-es.yaml (#1214)

* Translation of Logging in

* Typo fixed
---
 translations/base-es.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/translations/base-es.yaml b/translations/base-es.yaml
index bf0ba389..4944bd7f 100644
--- a/translations/base-es.yaml
+++ b/translations/base-es.yaml
@@ -53,7 +53,7 @@ global:
         escape: ESC
         shift: SHIFT
         space: ESPACIO
-    loggingIn: Logging in
+    loggingIn: Iniciando sesión
 demoBanners:
     title: Versión de prueba
     intro: ¡Obtén el juego completo para desbloquear todas las características!
@@ -77,7 +77,7 @@ mainMenu:
     back: Atrás
     puzzleDlcText: ¿Disfrutas compactando y optimizando fábricas?
         ¡Consigue ahora el DLC de Puzles en Steam para aún más diversión!
-    puzzleDlcWishlist: Añádelo ahora a tu lista de deseos!
+    puzzleDlcWishlist: ¡Añádelo ahora a tu lista de deseos!
 dialogs:
     buttons:
         ok: OK