6754 Commits

Author	SHA1	Message	Date
Anuken	8f8117e94b	Merge remote-tracking branch 'origin/master'	2020-07-25 14:38:13 -04:00
Anuken	d6d2e88b71	Saving of rotation of static blocks	2020-07-25 14:38:09 -04:00
Anuken	86ef6dc9d7	Merge pull request #2233 from Prosta4okua/master ... [Bundle][RU] actual translation	2020-07-25 14:34:23 -04:00
Anuken	c3881b57de	More research tweaks / Balancing	2020-07-25 13:29:50 -04:00
Anuken	ef381cb970	Fixed #2265	2020-07-25 10:59:18 -04:00
Anuken	b180462c45	Better tree layout	2020-07-25 10:25:48 -04:00
Felix Corvus	a0bdeb2649	Будем получать по куполу	2020-07-25 15:28:21 +03:00
Anuken	20077738d2	Research fixes	2020-07-24 23:56:14 -04:00
Anuken	38e55ab541	Added most things to tech tree	2020-07-24 23:38:33 -04:00
Felix Corvus	da4f042fa4	Я СКАЗАЛ РИССО	2020-07-25 03:12:21 +03:00
Anuken	17f86c5f77	Added missing tech tree blocks	2020-07-24 19:15:09 -04:00
Anuken	961e2a2490	Merge remote-tracking branch 'origin/master'	2020-07-24 13:51:00 -04:00
Anuken	1c8fd4cc38	https://github.com/Anuken/Mindustry-Suggestions/issues/336	2020-07-24 13:50:57 -04:00
Felix Corvus	43a0b6486a	РИССО	2020-07-24 20:50:03 +03:00
Patrick 'Quezler' Mounier	7bf299bcc0	Remove some spaces	2020-07-24 19:44:26 +02:00
Anuken	f41212b4d7	plastanium balancing	2020-07-24 13:42:11 -04:00
Felix Corvus	38a2ae0db2	Merge branch 'master' into master	2020-07-24 20:37:08 +03:00
Felix Corvus	07b5999b13	Merge branch 'master' into master	2020-07-24 20:34:49 +03:00
Anuken	58c39e14d6	risse -> risso	2020-07-24 13:27:15 -04:00
Felix Corvus	7c0080ee65	Russian translation of units	2020-07-24 20:20:35 +03:00
Anuken	8db4f88ecc	Plastanium conveyor blend fix	2020-07-24 12:56:30 -04:00
Anuken	0372ec7c9f	Bugfixes, balancing	2020-07-24 12:42:59 -04:00
Anuken	a48efd971c	Removed "naval" sector requirement	2020-07-24 10:53:17 -04:00
Anuken	c1283b856b	Some initial air boss stats	2020-07-23 21:50:07 -04:00
Anuken	d6af9a6671	arc	2020-07-23 17:39:28 -04:00
Anuken	72fc103e16	UI cleanup	2020-07-23 17:37:45 -04:00
Anuken	69f6154894	Updated bundles	2020-07-23 17:12:55 -04:00
Felix Corvus	91d54dfad3	Прочность	2020-07-23 19:46:46 +03:00
Felix Corvus	8c495a3f57	Update bundle_ru.properties	2020-07-23 19:30:48 +03:00
Anuken	3892cf2283	Merge remote-tracking branch 'origin/master'	2020-07-23 10:27:28 -04:00
Anuken	c93431ecc6	Bugfixes	2020-07-23 10:27:24 -04:00
Anuken	c8f3e26f44	Merge pull request #2247 from leweii/patch-1 ... Update bundle_zh_CN.properties	2020-07-23 09:23:31 -04:00
Anuken	565bac1e2b	Merge pull request #2254 from Remint32/master ... Textures micro fixes and improvements	2020-07-23 09:23:06 -04:00
Anuken	9e0bd49f04	Fixed #2255	2020-07-23 08:47:30 -04:00
Anuken	701aa840b3	Nondestructive unit cap enforcement	2020-07-22 14:31:44 -04:00
Anuken	b4594b2274	Hard enforcement of unit cap	2020-07-22 13:27:54 -04:00
Anuken	988da3b8e9	Balancing / Bugfixes	2020-07-22 11:03:38 -04:00
Felix Corvus	4157e3c74d	Update bundle_ru.properties	2020-07-22 04:02:57 +03:00
Felix Corvus	916a00b6ff	textures micro fixes and improvements	2020-07-22 03:40:58 +03:00
Anuken	43ca3ca210	Correct flow rate scaling	2020-07-21 19:51:57 -04:00
Anuken	93371b1cd0	Merge remote-tracking branch 'origin/master'	2020-07-21 19:49:50 -04:00
Anuken	973d907218	Balancing & bugfixes	2020-07-21 19:49:46 -04:00
Felix Corvus	2ef0e33227	spore-press frames sprites 6.0-ed	2020-07-22 02:18:55 +03:00
Anuken	5cfd784501	Merge remote-tracking branch 'origin/master'	2020-07-21 15:43:10 -04:00
Anuken	5c9e005397	Per-unit cap (still broken)	2020-07-21 15:43:02 -04:00
leweii	c9da9754ef	Update bundle_zh_CN.properties ... In Chinese properties, add some words, and try to make some sentences more fluent.	2020-07-20 14:05:30 +08:00
Felix Corvus	69dae20275	ru translation respawn line fix	2020-07-20 05:16:57 +03:00
Anuken	07b3991fdf	Merge pull request #2242 from XZimur/patch-1 ... Update bundle_uk_UA.properties	2020-07-19 21:37:07 -04:00
Anuken	4ef0143928	typo	2020-07-19 21:35:32 -04:00
Anuken	7a2a436a52	Fixed #2246	2020-07-19 21:34:31 -04:00