1222 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Mr.Yawnie	fb83a089f8	Update info-speed based on belt speed, update atlas project	2020-07-12 14:09:03 +10: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
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
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	9505eb8f49	Update local config	2020-07-07 19:34:00 +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
Astavie	900128ad32	comments and tabs 2: electric boogaloo	2020-07-07 16:51:40 +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	e251a25bb7	comments and tabs	2020-07-07 16:42:39 +02:00
Astavie	fbe04c94aa	linter, please like me	2020-07-07 16:38:33 +02:00
Astavie	1c2ccd3582	make the linter happy	2020-07-07 16:28:58 +02:00
Astavie	0caaa055aa	decimal separator	2020-07-07 16:19:26 +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
tobspr	4d92c67ef3	Merge pull request #411 from sergiocuemont/master ... Updated spanish translation	2020-07-07 14:40:07 +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
Mr.Yawnie	ac4a827c3f	fixed double fix	2020-07-07 22:20:42 +10:00
tobspr	3a6c1376fc	Update readme	2020-07-07 13:47:31 +02:00
MrYawnie	5f068cc91a	Merge pull request #1 from tobspr/master ... Updating my fork from original repo	2020-07-07 21:46:25 +10:00
tobspr	35f77416ba	Update translations to latest version	2020-07-07 13:34:49 +02:00
Mr.Yawnie	053a1609e3	Merge branch 'master' of https://github.com/MrYawnie/shapez.io	2020-07-07 21:25:32 +10:00
tobspr	8a4edb442c	Merge branch 'master' of https://github.com/tobspr/shapez.io	2020-07-07 13:17:38 +02:00
tobspr	a41a7099e6	Fix color mixing	2020-07-07 13:17:25 +02:00