From a4b122a91c05a73a5b45a077a6e66c703f8a92ba Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 4 Jun 2021 11:56:05 +0200 Subject: [PATCH] Preparations for 1.4.0 --- README.md | 12 ++++++------ src/css/states/main_menu.scss | 4 ++++ src/js/changelog.js | 6 +++--- src/js/states/main_menu.js | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 85b5d26b..84be6af7 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ This is the source code for shapez.io, an open source base building game inspired by Factorio. Your goal is to produce shapes by cutting, rotating, merging and painting parts of shapes. -- [Trello Board & Roadmap](https://trello.com/b/ISQncpJP/shapezio) -- [Free web version](https://shapez.io) -- [itch.io Page](https://tobspr.itch.io/shapezio) - [Steam Page](https://steam.shapez.io) - [Official Discord](https://discord.com/invite/HN7EVzV) <- _Highly recommended to join!_ +- [Trello Board & Roadmap](https://trello.com/b/ISQncpJP/shapezio) +- [itch.io Page](https://tobspr.itch.io/shapezio) +- [Free web version](https://shapez.io) ## Reporting issues, suggestions, feedback, bugs @@ -35,9 +35,9 @@ Your goal is to produce shapes by cutting, rotating, merging and painting parts You can use [Gitpod](https://www.gitpod.io/) (an Online Open Source VS Code-like IDE which is free for Open Source) for working on issues and making PRs to this project. With a single click it will start a workspace and automatically: -- clone the `shapez.io` repo. -- install all of the dependencies. -- start `gulp` in `gulp/` directory. +- clone the `shapez.io` repo. +- install all of the dependencies. +- start `gulp` in `gulp/` directory. [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/) diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index acd4a3c9..68103929 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -88,9 +88,13 @@ @include S(grid-column-gap, 10px); display: grid; + &[data-columns="1"] { grid-template-columns: 1fr; } + &[data-columns="2"] { + grid-template-columns: 1fr 1fr; + } .standaloneBanner { background: rgb(255, 75, 84); diff --git a/src/js/changelog.js b/src/js/changelog.js index 408f47f8..ee37c45f 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,11 +1,11 @@ export const CHANGELOG = [ { version: "1.4.0", - date: "27.05.2021", + date: "04.06.2021", entries: [ "Belts in blueprints should now always paste correctly", - "You can now clear belts by selecting them, and then pressing 'B'", - "Preparations for the puzzle dlc!", + "You can now clear belts by selecting them and then pressing 'B'", + "Preparations for the Puzzle DLC, coming June 22nd!", ], }, { diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index 9cbd726d..d1174020 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -95,7 +95,7 @@ export class MainMenuState extends GameState { ${ - !G_WEGAME_VERSION && ((G_IS_STANDALONE && puzzleDlc) || G_IS_DEV) + !G_WEGAME_VERSION && G_IS_STANDALONE && puzzleDlc ? `