1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Commit Graph

2089 Commits

Author SHA1 Message Date
Sense101
631359c739 Merge branch 'master' into puzzle 2021-06-27 10:32:50 +01:00
Sense101
e0afda7474 Merge remote-tracking branch 'tobspr/master' 2021-06-27 10:00:55 +01:00
tobspr
b6de716bee Clean up links 2021-06-25 19:29:23 +02:00
Sense101
e390e6e7d2 Merge branch 'master' into puzzle 2021-06-25 15:47:16 +01:00
Sense101
2c1c47b074 Merge remote-tracking branch 'tobspr/master' 2021-06-25 15:32:13 +01:00
tobspr
dba91fa50c Merge branch 'master' of https://github.com/tobspr/shapez.io 2021-06-25 16:31:56 +02:00
tobspr
db355da09e Minor puzzle control refactoring 2021-06-25 16:31:54 +02:00
DirkieDurky
79e8bd3196
Update translations (#1237)
New translations updated and fixed typing error
2021-06-25 16:20:20 +02:00
Kruger-Doggie
6ec2ff5d52
Updated base-de.yaml (#1232)
* Updated base-de.yaml

- Missing translations added
-Typing errors (from me) fixed

* Update base-de.yaml
2021-06-25 16:20:02 +02:00
Barış Can Yılmaz
8e8133ac15
fix turkish translation (#1228)
fixed typoes and translated english texts
2021-06-25 16:19:30 +02:00
Sense101
5fb7bb0586
Minor goal acceptor adjustments to help prevent backing up belts to complete (#1236)
* added the new splitter

* Update base-en.yaml

* added the new splitter

Update changelog and update translation regarding 20 upgrade tiers, closes #907

* Update base-en.yaml

* minor goal acceptor adjustments to help prevent backing up belts to complete

* removed gap between completion and fill as it doesn't look nice

* removed api override

* fixed mistake with fill percentage

* Allowed for copying acceptors to remember the required shape

* further adjusted required items, so it looks a bit nicer
2021-06-25 16:16:09 +02:00
tobspr
285dd3840d Some fixes 2021-06-25 16:15:05 +02:00
tobspr
6359bbeadf Update changelog 2021-06-25 16:10:27 +02:00
Sense101
a75a880126
Fixed blueprint not properly clearing on right click (#1235)
* added the new splitter

* Update base-en.yaml

* added the new splitter

Update changelog and update translation regarding 20 upgrade tiers, closes #907

* Update base-en.yaml

* fixed blueprints not clearing properly
2021-06-25 16:08:00 +02:00
Thomas (DJ1TJOO)
aa553e63eb
Fixed when achievements are given on levels (#1233)
Co-authored-by: TcePrepK <TcePrepK@users.noreply.github.com>

Co-authored-by: TcePrepK <TcePrepK@users.noreply.github.com>
2021-06-25 16:06:50 +02:00
Sense101
25db6e69ea kept api 2021-06-25 11:45:02 +01:00
Sense101
ad50bd64f7 Merge branch 'macro_fix_2' into puzzle 2021-06-25 11:44:24 +01:00
Sense101
c70f910f70 further adjusted required items, so it looks a bit nicer 2021-06-25 11:33:33 +01:00
Sense101
feb780394b Allowed for copying acceptors to remember the required shape 2021-06-25 11:31:26 +01:00
Sense101
11bb62b42c fixed mistake with fill percentage 2021-06-25 11:30:53 +01:00
Sense101
d339e18767 removed api override 2021-06-25 00:19:44 +01:00
Sense101
d3ac6db86c Merge branch 'macro_fix_2' into puzzle 2021-06-25 00:18:55 +01:00
Sense101
e9b072746b removed gap between completion and fill as it doesn't look nice 2021-06-24 22:08:34 +01:00
Sense101
1abf4ebd56 minor goal acceptor adjustments to help prevent backing up belts to complete 2021-06-24 21:48:31 +01:00
Sense101
2b9a24206b fixed blueprint not clearing properly on right click 2021-06-24 21:22:00 +01:00
Sense101
afb0a35538 Merge branch 'master' into puzzle 2021-06-24 19:35:03 +01:00
Sense101
2e4bbdac58 Merge remote-tracking branch 'tobspr/master' 2021-06-24 19:33:42 +01:00
Sense101
658a6a569e changed to the right api 2021-06-24 19:33:29 +01:00
Sense101
a16d11fbf6 Merge branch 'copy-paste' into puzzle 2021-06-24 18:28:19 +01:00
Sense101
cb1a729288 added back easter egg 2021-06-24 18:27:59 +01:00
tobspr
5074727efa Update translations and changelog 2021-06-24 19:16:10 +02:00
Sooxin
3cc179e283
Replace some punctuation marks by Chinese version and optimize format (#1225) 2021-06-24 19:15:39 +02:00
Kruger-Doggie
d4ef3a3a5e
Updated base-de.yaml (#1231)
Missing translations for Puzzle DLC added
2021-06-24 19:15:16 +02:00
YJSoft
4c2d1ba2d3
Fix korean translation (#1224) 2021-06-24 19:14:17 +02:00
dobidon
8eedd52963
Update base-tr.yaml (#1223)
* Update base-tr.yaml

* Update base-tr.yaml

Fixing YAML Syntax Error
2021-06-24 19:14:06 +02:00
Gumball73
bee3e6c626
Update base-pt-PT.yaml (#1222) 2021-06-24 19:13:53 +02:00
tobspr
7b18d54cbe Minor PR adjustments 2021-06-24 19:13:21 +02:00
tobspr
d24a4a848e Merge branch 'master' of https://github.com/tobspr/shapez.io 2021-06-24 18:46:49 +02:00
tobspr
9703187105 Start changelog for 1.4.2 2021-06-24 18:46:47 +02:00
Sense101
f7cc313ff4
Add back copy/paste in puzzle mode. (#1230)
* added the new splitter

* Update base-en.yaml

* added the new splitter

Update changelog and update translation regarding 20 upgrade tiers, closes #907

* Update base-en.yaml

* Added back copy/paste in puzzle mode

* fixed rotating non-rotatable buildings as blueprints and made blocker non-rotatable
2021-06-24 18:45:48 +02:00
Sense101
1c23549b39
Added a button to clear all non fixed buildings in both modes (#1229)
* added the new splitter

* Update base-en.yaml

* added clear buildings button to both game modes

* Minor cleanups and added translation for new button
2021-06-24 18:41:37 +02:00
Sense101
6efbdc6ad1
Fix for cheating puzzles by quickly switching belts (#1226)
* added the new splitter

* Update base-en.yaml

* adjusted how acceptor works to fix macro

* fixed a minor bug

* applied changes to the puzzle-editor-review script

* minor cleanups
2021-06-24 18:39:50 +02:00
Sense101
20c24f5997 fixed rotating non-rotatable buildings as blueprints and made blocker non-rotatable 2021-06-24 16:47:59 +01:00
Sense101
6dd4d5b57a Merge branch 'clear-buildings-button' into puzzle 2021-06-24 15:18:39 +01:00
Sense101
7667b5e43b Merge branch 'copy-paste' into puzzle 2021-06-24 15:18:31 +01:00
Sense101
6f85212fd8 Merge branch 'macro-fix' into puzzle 2021-06-24 15:18:20 +01:00
Sense101
c12be469dd Added back copy/paste in puzzle mode 2021-06-24 15:10:41 +01:00
Sense101
74b4c3a9e5 Merge remote-tracking branch 'origin/master' 2021-06-24 12:39:11 +01:00
Sense101
91cadddd4a Merge remote-tracking branch 'tobspr/master' 2021-06-24 12:36:13 +01:00
Sense101
1297089498 Merge remote-tracking branch 'tobspr/master' 2021-06-24 12:36:13 +01:00