1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Commit Graph

701 Commits

Author SHA1 Message Date
RogiJAG
adecb64447 Revert "add unlock on upgrade mechanic"
This reverts commit 6dd3f2a439.

lease enter the commit message for your changes. Lines starting
2020-07-19 10:47:47 -05:00
Moppler
e32926fa08 Add Yaml config and fif all errors 2020-07-19 09:40:52 +01:00
BuildTools
6dd3f2a439 add unlock on upgrade mechanic 2020-07-18 12:03:49 -05:00
Mr.Yawnie
93ac3f70be Added artwork and en translation, unlocks with CCW 2020-07-18 12:03:49 -05:00
Stamen
9bc1d24d1a
Update base-sr.yaml 2020-07-18 16:39:26 +02:00
Stamen
c690f658c5
Minor translation fixes
Fixed some typos and translation adjustments
2020-07-18 16:30:39 +02:00
Stamen
6a46497abd
Update base-sr.yaml
Full Serbian translation
2020-07-18 16:12:19 +02:00
tobspr
a671783073 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-18 15:54:04 +02:00
tobspr
3bf9205b90 Add serbian prefab 2020-07-18 15:54:01 +02:00
tobspr
7800b9f4e1
Merge pull request #460 from xbfld/patch-1
Update base-kor.yaml
2020-07-18 14:43:18 +02:00
tobspr
f0e9ee66a2
Merge pull request #443 from martypiton/patch-1
French translation update
2020-07-18 14:33:43 +02:00
cehigi
f1579b16f1
Update base-kor.yaml
Translate updated stuff, correct misspells and errors, but left controversial words behind (maybe issuing later)
2020-07-18 10:22:09 +09:00
martypiton
32bd17080e
Fix build failed
Removed special char to try fixing the build
2020-07-14 16:36:28 +02:00
martypiton
c970e01fb8
Merge branch 'master' into patch-1 2020-07-14 16:06:54 +02:00
martypiton
108919dc83
Added the suggested changes 2020-07-14 15:13:53 +02:00
PedroRajao
18810f1086
Merge branch 'master' into pt-br_fixes 2020-07-13 18:12:30 -03:00
tobspr
4ebf78c236 Add indonesian prefab 2020-07-13 22:46:44 +02:00
tobspr
dcb9b39998
Merge pull request #439 from PascalGrosse/master
Updated french translation
2020-07-13 19:31:51 +02:00
tobspr
b565b5dcfb
Merge pull request #423 from NiceManiac/master
Update base-no.yaml
2020-07-13 19:31:35 +02:00
Pascal Grossé
e590953ac2 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-13 19:27:58 +02:00
NiceManiac
cc319fd87c Update base-no.yaml
removed comments
2020-07-13 18:58:20 +02:00
NiceManiac
9c55c5b269 Update base-no.yaml 2020-07-13 18:50:58 +02:00
tobspr
f31ee5edb1
Merge pull request #445 from kal39/patch-1
Update base-ja.yaml
2020-07-13 18:29:20 +02:00
tobspr
6af31af5f6
Merge pull request #444 from Sapper17/patch-1
Update base-ru.yaml
2020-07-13 18:29:08 +02:00
tobspr
902133838c
Merge pull request #438 from 12jgy/patch-1
Some Brazilian Portuguese Translations
2020-07-13 18:26:47 +02:00
tobspr
aa224c5ef2
Merge pull request #436 from CodeIsNotEvil/patch-1
Update base-de.yaml
2020-07-13 18:25:19 +02:00
tobspr
aa3c69f062
Merge pull request #434 from juitinglu/patch-1
Update base-zh-TW.yaml
2020-07-13 18:24:46 +02:00
tobspr
97abef4fe7
Merge pull request #433 from Killgaru/Lang_ru
Russian translation updated
2020-07-13 18:24:23 +02:00
tobspr
42c05db47f
Merge pull request #432 from nukuuu/patch-6
Updated pt-pt translation to the latest version
2020-07-13 18:23:45 +02:00
tobspr
b95ca77881
Merge pull request #431 from Zilounay/patch-1
Update base-fr.yaml
2020-07-13 18:23:09 +02:00
12jgy
0716778957
Update base-pt-BR.yaml 2020-07-12 17:32:44 -03:00
Kai Kitagawa-Jones
82f11ee7e3
Fix indentation
Co-authored-by: Markus Jarderot <mizardx+github@gmail.com>
2020-07-13 05:17:59 +09:00
Kai Kitagawa-Jones
6d5c7087dd
Update base-ja.yaml 2020-07-12 17:37:13 +09:00
PedroRajao
29fc2bac99
Update base-pt-BR.yaml
minor typo
2020-07-11 17:36:44 -03:00
PedroRajao
d3db39b91f
Update base-pt-BR.yaml
fix typo
2020-07-11 17:32:19 -03:00
PedroRajao
6c246cc832
Update base-pt-BR.yaml
Duplicate keys fixes from:
https://github.com/tobspr/shapez.io/pull/442
2020-07-11 16:46:30 -03:00
PedroRajao
35ead502a1
Update translations/base-pt-BR.yaml
Commit suggestion

Co-authored-by: Markus Jarderot <mizardx+github@gmail.com>
2020-07-11 16:29:03 -03:00
PedroRajao
4cc6b2d0f0
Update translations/base-pt-BR.yaml
Commit suggestion

Co-authored-by: Markus Jarderot <mizardx+github@gmail.com>
2020-07-11 16:28:53 -03:00
Sapper17
b89b2356a2
Update base-ru.yaml 2020-07-11 21:50:48 +03:00
martypiton
75b56cf44a
Another little correction 2020-07-11 17:57:52 +02:00
martypiton
98e8846dec
Translation completed
I have reviewed and correct all little mistakes and translated everything !
2020-07-11 17:43:29 +02:00
pedrorajao
22c6c0da18 replace 'peças' by formas 2020-07-10 21:37:23 -03:00
pedrorajao
dff072ddb9 Add/fix translation, placeholder fixes 2020-07-10 14:00:51 -03:00
juitinglu
09a54fa488
Update base-zh-TW.yaml 2020-07-11 00:43:57 +08:00
PedroRajao
15ecda7cdb
Update base-pt-BR.yaml 2020-07-10 12:05:55 -03:00
Pascal Grossé
c25a1e0af7 Updated french translation 2020-07-10 14:28:04 +02:00
pedrorajao
586e1a5d56 update translations and fix some removed placeholders 2020-07-10 02:49:15 -03:00
12jgy
f49c2cd9d0
Update base-pt-BR.yaml 2020-07-10 02:29:14 -03:00
CodeIsNotEvil
0b45c87dbd
Update base-de.yaml
Not necessary grammar modifications, but they are more common used ones.
2020-07-10 04:27:12 +02:00
juitinglu
f26ff0a049
Update base-zh-TW.yaml 2020-07-10 01:05:19 +08:00
Killgaru
1674fbb66b Russion translation updated 2020-07-09 17:53:24 +03:00
nukuuu
ed71599406
Updated pt-pt translation to the latest version 2020-07-09 11:29:48 +01:00
Gil Sand
f32b6ecfc0
Update base-fr.yaml
Added corrections to french in the first 200 lines only.
2020-07-09 12:01:41 +02:00
Slownick
1af0af8924
Update base-nl.yaml
Spellcheck and small grammar edits
2020-07-09 10:44:12 +02:00
NiceManiac
e75c9dfa01 Update base-no.yaml
Translated the Steam store page completely
2020-07-08 08:03:21 +02:00
Wessel
5a49e3fcc6
Update base-nl.yaml 2020-07-08 00:26:00 +02:00
Wessel
4a19781888
Update base-nl.yaml 2020-07-08 00:24:56 +02:00
Wessel
0f56097054
Update base-nl.yaml 2020-07-08 00:23:56 +02:00
Wessel
dab64cc5fc
Update base-nl.yaml
Translated new content and minor improvements
2020-07-08 00:13:38 +02:00
tobspr
5a8fce4248
Merge pull request #417 from W0LFB0MB/patch-4
Update base-pl.yaml
2020-07-07 19:41:36 +02:00
tobspr
ce008f0659 Minor translation adjustments 2020-07-07 19:41:05 +02:00
tobspr
a08fef88f0
Merge pull request #416 from Astavie/master
Add decimal separator option in translation files
2020-07-07 19:40:27 +02:00
tobspr
8b383c264b
Merge pull request #415 from BaleineSanguine/patch-1
Update base-fr.yaml
2020-07-07 19:39:12 +02:00
tobspr
9f85651df9 Fix translation 2020-07-07 19:38:45 +02:00
tobspr
ca67c42b01
Merge pull request #413 from zanknafelc/patch-1
Created Slovenian translation for Steam page
2020-07-07 19:38:24 +02:00
tobspr
a11d8fdf6b
Merge pull request #414 from sergiocuemont/master
Update base-es.yaml
2020-07-07 19:37:55 +02:00
tobspr
37ec8b9835 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-07 19:33:46 +02:00
tobspr
ba4ca7f50b Update store translation 2020-07-07 19:33:45 +02:00
Ali Erturan
f5d59228ff
Update base-pl.yaml
Added a few English to Polish translations that were not yet added
2020-07-07 15:44:29 +01:00
Astavie
0caaa055aa decimal separator 2020-07-07 16:19:26 +02:00
martypiton
e0077b07d0
New version entirely completed and corrected !
Add translate version of the Steam page, corrected little mistakes and translated new items not implemented yet !
2020-07-07 16:15:27 +02:00
BaleineSanguine
87be2bc75b
Update base-fr.yaml
Updated for new steam page
2020-07-07 15:15:39 +02:00
sergiocuemont
71fc698971
Update base-es.yaml
Standalone Advantages
2020-07-07 14:51:30 +02:00
zanknafelc
a23ebd0dd0
Created Slovenian translation for Steam page
I will translate also other stuff later this week :)
2020-07-07 14:43:46 +02:00
tobspr
10d82a72fb
Merge pull request #412 from frankivo/dutch
Fixes in Dutch translation
2020-07-07 14:40:24 +02:00
sergiocuemont
f480bf34d2
Merge branch 'master' into master 2020-07-07 14:29:46 +02:00
Frank Oosterhuis
fecd5036a0 copy key 2020-07-07 14:26:38 +02:00
Frank Oosterhuis
5678271f45 energy 2020-07-07 14:25:59 +02:00
Frank Oosterhuis
a8c34f4d56 invertor 2020-07-07 14:25:52 +02:00
Frank Oosterhuis
6e4fa4a305 switch layers 2020-07-07 14:25:02 +02:00
Frank Oosterhuis
d740a94763 translate 'menuClose' 2020-07-07 14:23:59 +02:00
Frank Oosterhuis
2257fed31f translate 'cancel' 2020-07-07 14:23:25 +02:00
Frank Oosterhuis
f62ea71a35 fix typo 2020-07-07 14:22:45 +02:00
tobspr
3a6c1376fc Update readme 2020-07-07 13:47:31 +02:00
tobspr
35f77416ba Update translations to latest version 2020-07-07 13:34:49 +02:00
sergiocuemont
95a1733cc6
Update base-es.yaml 2020-07-07 12:47:57 +02:00
sergiocuemont
4d450b13b9
Update base-es.yaml
Empty spaces
2020-07-07 12:46:32 +02:00
sergiocuemont
b12f1a3781
Update base-es.yaml
Translated to the last version
2020-07-07 12:44:44 +02:00
tobspr
f69caa9f1a Change uncolored -> gray 2020-07-07 09:35:23 +02:00
tobspr
6f85d7c810
Merge pull request #397 from isaisstillalive/renameMarker
Changed "Delete marker" to "Show rename (or delete) marker dialog"
2020-07-07 09:11:28 +02:00
tobspr
5871117482 Fix translation 2020-07-07 09:08:03 +02:00
tobspr
074e6f57f1
Merge pull request #406 from RedboomITA/patch-1
base-it.yaml
2020-07-07 09:07:39 +02:00
tobspr
3fe0615840
Merge pull request #401 from DerFeldspatz/patch-12
Update base-de.yaml
2020-07-07 09:07:05 +02:00
tobspr
0d6b855253 Allow color inverter to process colors as well 2020-07-07 09:06:17 +02:00
tobspr
2e66c12122 Add ukrainian language prefab 2020-07-07 07:11:39 +02:00
isaisstillalive
f1bcec65ad Refactor dialog title 2020-07-07 09:15:32 +09:00
isaisstillalive
8acefda778 Show edit marker dialog instead deleting marker 2020-07-07 08:22:51 +09:00
tobspr
04ea105584 Fix lots of bugs, add wire splitters / mergers 2020-07-06 21:33:37 +02:00
RedboomITA
da52699a7a
base-it.yaml
I've just added some more translations from the English to the Italian. I wish that u will appreciate.
2020-07-06 21:02:05 +02:00
tobspr
92a2f4caf1 Fix invalid translations 2020-07-06 20:52:28 +02:00
DerFeldspatz
716dc3821f
Update base-de.yaml 2020-07-06 19:58:36 +02:00
tobspr
d6fdee48be
Merge pull request #400 from ArnauGomar/patch-2
Patch 2
2020-07-06 19:05:17 +02:00
DerFeldspatz
0d7d8b99e3
Update base-de.yaml
Adapt translation of the store page to the most recent english version. Translate latest settings option
2020-07-06 17:42:20 +02:00
ArnauGomar
aa6e1d8f38
Update base-cat.yaml 2020-07-06 16:56:13 +02:00
tobspr
830a1d6184 Fix translation 2020-07-06 15:18:18 +02:00
tobspr
4dcdf0535b
Merge pull request #396 from Astavie/patch-2
Update base-nl.yaml
2020-07-06 14:52:21 +02:00
tobspr
ef8d520d94 Add slovenian translation prefab 2020-07-06 14:03:50 +02:00
tobspr
6c6ad6af22 Update standalone build script 2020-07-06 08:14:44 +02:00
tobspr
34ef26b289 Fix multiple issues regarding saving / restoring games 2020-07-05 16:56:01 +02:00
Astavie
8c777a4712
Additieve kleurmening 2020-07-05 14:27:03 +02:00
Astavie
8593e05de3
Update base-nl.yaml 2020-07-05 13:46:22 +02:00
tobspr
0b9b35b79e Update store page, again 2020-07-05 13:13:58 +02:00
tobspr
23df0cf1e0 Update store page text 2020-07-05 13:08:13 +02:00
tobspr
e3875aab2a Fix translation error 2020-07-05 12:55:13 +02:00
tobspr
5e67ae8548 Update store page 2020-07-05 12:52:33 +02:00
tobspr
c87b87c572 Minor phrasing change 2020-07-05 12:14:29 +02:00
tobspr
ec38c6820a
Merge pull request #383 from isaisstillalive/warningInsufficientCut
Confirm cutting if not enough shapes to rebuild blueprint back
2020-07-05 12:13:48 +02:00
tobspr
c81be8b1a3
Merge pull request #395 from Astavie/patch-1
Change the suffix for large numbers to use SI in Dutch
2020-07-05 12:12:23 +02:00
tobspr
58633ef04a
Merge pull request #390 from RisenAlex/patch-2
Update base-ro.yaml
2020-07-05 12:10:40 +02:00
tobspr
4497bbb2ff
Merge pull request #389 from ivanbratovic/patch-1
Add first version of Croatian translation.
2020-07-05 12:10:21 +02:00
Astavie
6ee05a7e0d
Change the suffix for large numbers to use SI
Changes made:
 - change 'k' to uppercase 'K' (source: https://taaladvies.net/taal/advies/vraag/1818/)
 - change 'B' to 'G'

This PR has been made because the English system does not work for Dutch. As `mln.`, `mlj.`, and `bln.` are too long for the game, I suggest using the SI suffixes instead of the English ones.
2020-07-05 12:04:39 +02:00
isaisstillalive
0ba4722be6 Show confirm dialog instead of notification 2020-07-05 11:14:11 +09:00
isaisstillalive
6a279923e3 If cost is low, copy instead of cut 2020-07-05 09:51:45 +09:00
RisenAlex
e0f57788a6
Update base-ro.yaml 2020-07-04 19:30:40 +03:00
tobspr
db5b2e5870
Merge pull request #384 from Jaeyoon07031/patch-1
Super minor changes
2020-07-04 16:37:18 +02:00
tobspr
3a1ef1ec5f
Merge pull request #381 from RisenAlex/patch-4
Update base-ro.yaml
2020-07-04 16:35:10 +02:00
Ivan Bratović
ed74c4be6e
Add first version of Croatian translation.
This is still incomplete, I still have some things left to translate. However, should be good enough for a first version.
2020-07-04 16:26:49 +02:00
RisenAlex
c4f7d69864
Update base-ro.yaml 2020-07-04 00:37:46 +03:00
RisenAlex
9d69bc87f2
Update base-ro.yaml 2020-07-03 18:35:08 +03:00
EnderDoom77
0d433d0460
Update base-cat.yaml
Changed mostra => mostrant (To show that it's whatever is happening at the moment rather than what it does, since it's a status, not a button)
Translated rewards section
Canviat Fem => Paperera (més directe) (incluïnt la variant central "brossa")
2020-07-03 16:35:47 +02:00
Jaeyoon07031
cea6692e2a
Super minor changes
Just found small changes i can make, not really big.
Someone was probably using google translate for the new parts and they could be replaced with better words so thats just what i did.
These changes are really small so you can wait for me to make more changes later on and then merge it.
2020-07-03 22:21:29 +09:00
RisenAlex
23119f9a1f
Update base-ro.yaml 2020-07-03 13:05:45 +03:00
isaisstillalive
50c53ec1f2 Close-shop-and-stats key mapping doesn't seem to exist 2020-07-03 17:31:19 +09:00
tobspr
689980f819
Merge pull request #379 from RisenAlex/patch-2
Update base-ro.yaml
2020-07-03 08:53:20 +02:00
tobspr
df3121aca2
Merge pull request #378 from JeremyMeissner/patchfr-1
Update base-fr.yaml
2020-07-03 08:53:04 +02:00
tobspr
a99d12a7ff
Merge pull request #377 from EnderDoom77/patch-2
Made minor adaptations for consistency or grammar
2020-07-03 08:52:45 +02:00
tobspr
4ca867d346
Merge pull request #364 from rogeriocamorim/patch-1
Update base-pt-BR.yaml
2020-07-03 08:48:05 +02:00
tobspr
c8fd9b8789
Merge pull request #362 from Gumball73/patch-4
Update base-pt-PT.yaml
2020-07-03 08:47:46 +02:00
tobspr
31fa93bbe6
Merge pull request #359 from Jaeyoon07031/patch-3
A few small changes
2020-07-03 08:46:57 +02:00
ArnauGomar
3c994c16d8
Update base-cat.yaml 2020-07-03 00:51:55 +02:00
RisenAlex
4031ad526e
Update base-ro.yaml 2020-07-03 01:31:18 +03:00
Jeremy Meissner
2aa4673d69 Update base-fr.yaml
Fix the marker demo description text misspelling
2020-07-02 22:44:19 +02:00
EnderDoom77
d8c88fcb3c
Halfs => Halves 2020-07-02 22:28:05 +02:00
EnderDoom77
33f6c570c2
Translated up to Energy Generator 2020-07-02 22:22:45 +02:00
EnderDoom77
f6f583b4f4
Made minor adaptations for consistency or normativity.
Raise is transitive, use rise when there's no object.
Made capitalisation more consistent
Allow/enable followed by either: gerund or noun. Use infinitive when the subject (who is allowed/able) is explicitly stated. (more natural)
Commas must be used around non-determining relative clauses.
Added hyphens to counter-clockwise (counterclockwise also valid), user-contributed, and auto-orientation (prefix can't be left alone).
Added a few objects (shapes / belts) to make the text more explicit where objects should naturally be stated.
2020-07-02 21:05:37 +02:00
ArnauGomar
6f72ca7d95
Update base-cat.yaml 2020-07-02 20:45:05 +02:00
EnderDoom77
b02c7560ab
Merge branch 'master' into patch-1 2020-07-02 19:58:45 +02:00
tobspr
d75fb184a4 Implement color inverter building 2020-07-02 18:16:04 +02:00
tobspr
30509be6b7 Add catalan language prefab 2020-07-02 09:48:15 +02:00
Rogerio Camorim
133c66ebaf
Added more texts. 2020-07-01 16:00:35 -05:00