Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity
1,279 Commits 6 Branches 26 Tags 655 MiB
Commit Graph

1279 Commits

Author SHA1 Message Date
tobspr 6ff26cacad Update travis 2020-07-19 11:02:37 +02:00
tobspr 18c19b9e35 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-19 09:19:44 +02:00
tobspr 0a482972fd Fix build failing 2020-07-19 09:19:42 +02:00
tobspr 7ccdcea662
Update README.md 2020-07-18 20:40:40 +02:00
tobspr 407fd3a683
Merge pull request #464 from xTeamStanly/patch-2 
Minor translation fixes
 2020-07-18 18:23:43 +02: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
tobspr 7e7f135525
Merge pull request #461 from xTeamStanly/patch-1 
Updated base-sr.yaml
 2020-07-18 16:14:04 +02:00
Stamen 6a46497abd
Update base-sr.yaml 
Full Serbian translation
 2020-07-18 16:12:19 +02:00
tobspr 6189c08fcc Update readme 2020-07-18 16:06:23 +02:00
tobspr 1c5c45d394 Update readme with recommended workflow 2020-07-18 16:04:30 +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 aed8c813c4
Merge pull request #459 from MrYawnie/patch-1 
Match belt/processor etc. level to upgrade tiers
 2020-07-18 14:42:57 +02:00
tobspr 051e04edd1 Minor css improvements 2020-07-18 14:41:34 +02:00
tobspr 4efd690bc3
Merge pull request #458 from Djspaceg/ui/optimization-1 
Optimized some UI layers for fewer paints on interaction
 2020-07-18 14:38:37 +02:00
tobspr f0e9ee66a2
Merge pull request #443 from martypiton/patch-1 
French translation update
 2020-07-18 14:33:43 +02:00
tobspr b4e5319ab5
Merge pull request #442 from PedroRajao/pt-br_fixes 
Pt br fixes
 2020-07-18 14:33:20 +02:00
MrYawnie 68ebf07052
Changed "level" to "tier" for consistency 2020-07-18 17:41:16 +10: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
MrYawnie efffa8940b
Match belt/processor etc. level to upgrade tiers 
Currently the belt (+ processor) levels do not match to the upgrade shop tiers. The tiers start from Tier 1, and once upgraded, they go to tier 2, 3, ... 7. So tier 7 is currently the highest.

However, the belt level starts from level 0, and increases to level 1 once upgraded. The maximum level is therefore 6.

This PR raises the start level of belts and other items to level 1, meaning the levels match the upgrade tiers in the shop.
 2020-07-17 16:11:22 +10:00
Blake Stephens d81c9e80c9 Optimized some UI layers for fewer paints on interaction 2020-07-16 19:43:37 -07: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 27921e9d0e Remove unused file 2020-07-13 22:57:11 +02:00
tobspr 4ebf78c236 Add indonesian prefab 2020-07-13 22:46:44 +02:00
tobspr dec9f45957 Merge branch 'master' of https://github.com/tobspr/shapez.io 2020-07-13 22:46:09 +02:00
tobspr 05716e6a74 Fix page not loading sometimes 2020-07-13 22:46:07 +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
tobspr 00c02f3ab6
Merge pull request #430 from Slownick/patch-1 
Update base-nl.yaml
 2020-07-13 18:22:38 +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