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

1260 Commits

Author SHA1 Message Date
Mr.Yawnie
9d60cfd120 Updated counter art 2020-07-17 21:35:11 +10:00
MrYawnie
40a2826fb6
Merge pull request #10 from Moppler/feature/counter-building
Feature/counter building
2020-07-16 14:00:44 +10:00
Moppler
756a7dcbe6 Final refinements. 2020-07-15 16:24:45 +01:00
Moppler
70f5391355 Merge branch 'master' into feature/counter-building 2020-07-15 15:13:20 +01:00
Moppler
2463a7236b
Merge pull request #3 from tobspr/master
Update from Base repo
2020-07-14 22:51:44 +01: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
Moppler
414844aab7
Merge pull request #2 from MrYawnie/counter-playground
Change speed info for counter to match belt speed
2020-07-12 17:20:56 +01:00
Kai Kitagawa-Jones
6d5c7087dd
Update base-ja.yaml 2020-07-12 17:37:13 +09:00
Mr.Yawnie
fb83a089f8 Update info-speed based on belt speed, update atlas project 2020-07-12 14:09:03 +10:00
Sapper17
b89b2356a2
Update base-ru.yaml 2020-07-11 21:50:48 +03:00
Moppler
4fe75877af
Merge pull request #1 from MrYawnie/counter-playground
Added visuals for the item counter
2020-07-11 16:27:08 +01:00
Mr.Yawnie
3265e3ffd8 Added graphics for item counter 2020-07-12 01:16:07 +10:00
MrYawnie
f02fe91bed
Merge pull request #7 from Moppler/feature/counter-building
Pull original counter code
2020-07-12 00:59:15 +10:00
Mr.Yawnie
57844e9f15 back to "stock" 2020-07-12 00:36:32 +10:00
Moppler
dd4de1cdea Initial attempt at couter building 2020-07-10 23:38:53 +01:00
juitinglu
09a54fa488
Update base-zh-TW.yaml 2020-07-11 00:43:57 +08:00
Pascal Grossé
c25a1e0af7 Updated french translation 2020-07-10 14:28:04 +02: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
Killgaru
0d1f6e65ee
Merge pull request #14 from tobspr/master
Update
2020-07-09 14:24:26 +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
Mr.Yawnie
1e4c92848b Adv Processors are upgradeable, purple is now magenta 2020-07-09 17:13:15 +10:00
MrYawnie
00844d5700
Merge pull request #2 from tobspr/master
Pull original repo changes
2020-07-09 12:13:23 +10:00
tobspr
2ccf39f1bf
Merge pull request #420 from Ryoncai/patch-8
Update base-nl.yaml
2020-07-08 09:23:57 +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