tobspr
35018d2778
Minor css improvements
2020-07-21 10:14:06 +02:00
tobspr
75c9d9d8fd
Merge pull request #478 from bjornstar/update-browser-sync
...
Update browser-sync from v2.24.6 to v2.26.10
2020-07-21 09:29:48 +02:00
tobspr
661746c898
Merge pull request #471 from RogiJAG/180_deg_rotater
...
180 Degree Rotater Variant
2020-07-21 09:25:36 +02:00
tobspr
b01e7c61d7
Merge pull request #470 from Moppler/bug/pipette-belts-wires
...
Extend the pipette hack to work with belts and wires.
2020-07-21 09:24:08 +02:00
Bjorn Stromberg
fa53a5d2e1
Update browser-sync from v2.24.6 to v2.26.10
2020-07-21 10:34:29 +09:00
RogiJAG
150bf718f7
Merge branch 'master' into 180_deg_rotater
2020-07-19 11:15:30 -05:00
RogiJAG
9258a49010
remove debug statements
2020-07-19 11:11:58 -05:00
RogiJAG
adecb64447
Revert "add unlock on upgrade mechanic"
...
This reverts commit 6dd3f2a439
2020-07-19 10:47:47 -05:00
Moppler
ae5c33abd2
Extend the pipette hack to work with belts and wires.
2020-07-19 15:56:40 +01:00
tobspr
c111d88dc9
Merge branch 'master' of https://github.com/tobspr/shapez.io
2020-07-19 11:02:39 +02:00
tobspr
6ff26cacad
Update travis
2020-07-19 11:02:37 +02:00
tobspr
aeda9ed7d0
Merge pull request #468 from Moppler/validate-translations
...
Validate translations
2020-07-19 11:00:25 +02:00
Moppler
e32926fa08
Add Yaml config and fif all errors
2020-07-19 09:40:52 +01:00
Moppler
96cde952a7
Disable strict checking as most translators work direct on github
2020-07-19 09:11:39 +01:00
Moppler
f77d31dd33
Enable strick checking
2020-07-19 08:43:23 +01:00
Moppler
b027d5b7da
Add YAML lint step to github workflow
2020-07-19 08:39:21 +01: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
BuildTools
c1a518f775
fix circular dependency
2020-07-18 20:46:42 -05:00
Moppler
f3c1cec4f2
Merge pull request #5 from tobspr/master
...
Sync with master on tobspr/shapez.io
2020-07-19 00:05:26 +01:00
BuildTools
4782fa87b1
Merge remote-tracking branch 'origin' into 180_deg_rotater
2020-07-18 15:45:49 -05:00
tobspr
7ccdcea662
Update README.md
2020-07-18 20:40:40 +02: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
RogiJAG
f77d47d9f7
Add fl rotater variant
2020-07-18 12:03:49 -05: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
Moppler
2463a7236b
Merge pull request #3 from tobspr/master
...
Update from Base repo
2020-07-14 22:51:44 +01: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
