mirror of
				https://github.com/tobspr/shapez.io.git
				synced 2025-06-13 13:04:03 +00:00 
			
		
		
		
	Merge branch 'master' of https://github.com/tobspr/shapez.io
This commit is contained in:
		
						commit
						2765e6e81d
					
				| @ -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"] | ||||
|  | ||||
| @ -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, | ||||
|         ]; | ||||
|     } | ||||
| 
 | ||||
|     /** | ||||
|  | ||||
| @ -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="${ | ||||
|  | ||||
| @ -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! | ||||
| @ -75,9 +75,9 @@ mainMenu: | ||||
|     savegameUnnamed: Sin nombre | ||||
|     puzzleMode: Modo Puzle | ||||
|     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! | ||||
|     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! | ||||
| dialogs: | ||||
|     buttons: | ||||
|         ok: OK | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user