Commit Graph

6607 Commits

Author SHA1 Message Date
Patrick 'Quezler' Mounier
164dd0c405 Revert "Revert "Revert "Revert "Repurpose branch to be played""""
This reverts commit 8caa9ed548.
2020-03-16 09:15:44 +01:00
Anuken
2250f2f0bc Stack trace 2020-03-16 01:08:45 -04:00
Petr Gašparík
ad6d819b8f Czech translation - fixed typo 2020-03-16 00:06:39 +01:00
Petr Gašparík
0749120df3 Czech - update translations for 104.x 2020-03-16 00:05:20 +01:00
Petr Gašparík
865397983b Czech - ud to date translation 2020-03-15 23:43:52 +01:00
Petr Gašparík
b6f1b7570b Merge branch 'master' of https://github.com/Anuken/Mindustry into v104 2020-03-15 23:30:37 +01:00
Vanguard
11b6ae58d7 1 new line, 1 changed line
New:
rules.deconstructrefundmultiplier

Changed:
stat.deconstructed
2020-03-16 00:34:58 +03:00
Patrick 'Quezler' Mounier
8caa9ed548 Revert "Revert "Revert "Repurpose branch to be played"""
This reverts commit 4b08cfd2b7.
2020-03-15 22:04:10 +01:00
Patrick 'Quezler' Mounier
4f195b72d1 Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
Patrick 'Quezler' Mounier
4b08cfd2b7 Revert "Revert "Repurpose branch to be played""
This reverts commit 9df875354a.
2020-03-15 22:00:45 +01:00
ma44
ec34e27102 map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
laohuaji233
377ac2be90 Update bundle_zh_CN.properties 2020-03-12 22:48:34 +08:00
laohuaji233
9e8dbfdc03 Update bundle_zh_CN.properties 2020-03-12 21:33:26 +08:00
Prosta4okua
7db5d14048 Update bundle_uk_UA.properties 2020-03-12 11:37:54 +02:00
Aldas
680b2bc6b6 Translated launch.skip.confirm line 2020-03-11 12:12:30 +02:00
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
unakiritan
12380f54d2 Create short-description.txt
Japanese Steam metadata.
2020-03-10 14:51:43 +09:00
Vanguard
c4d3c18dda Merge branch 'master' into master 2020-03-10 05:44:57 +03:00
Vanguard
424514e037 2 new lines
schematic.replace
schematic.exists
2020-03-10 05:39:14 +03:00
Prosta4okua
521f367286 Update bundle_uk_UA.properties 2020-03-09 19:17:32 +02:00
Aldas
b4df9e37d7 Grammar corrections
grammar corrections
2020-03-09 18:39:43 +02:00
Anuken
f63d1874c2 Merge remote-tracking branch 'origin/master' 2020-03-09 09:41:51 -04:00
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
DeltaNedas
9ef394a99e set current mod to required mod (#1684)
or you will need to prefix mod name in requires of the required mod
instead you now need to prefix current mods name after youve required from another mod
2020-03-07 22:47:12 -05:00
Anuken
7aa71f38c3 Merge remote-tracking branch 'origin/master' 2020-03-07 14:36:50 -05:00
Anuken
8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
Patrick 'Quezler' Mounier
f931469132 This does ¬ seem nececary anymore somehow 2020-03-06 18:08:18 +01:00
Patrick 'Quezler' Mounier
afdb0aa8c2 Fix sleep visualizer 2020-03-06 17:21:17 +01:00
Patrick 'Quezler' Mounier
73414d7c2a Collapse if 2020-03-06 14:59:12 +01:00
Patrick 'Quezler' Mounier
c1f025db52 Rename reload to cooldown 2020-03-06 14:57:11 +01:00
Patrick 'Quezler' Mounier
087aef6b85 Move capacity into crater 2020-03-06 11:06:35 +01:00
Patrick 'Quezler' Mounier
7ddcd93a57 Use extended position 2020-03-06 10:28:49 +01:00
Patrick 'Quezler' Mounier
caa25b811b Condense single use rotation 2020-03-06 10:22:37 +01:00
Patrick 'Quezler' Mounier
5a60ab1d2a Privatize drawer 2020-03-06 10:20:47 +01:00
Patrick 'Quezler' Mounier
8a25d57c83 This looks good to 2020-03-06 10:17:02 +01:00
Patrick 'Quezler' Mounier
c5de6706e0 Eyecandyfi 2020-03-06 10:14:52 +01:00
Patrick 'Quezler' Mounier
f50ee2ecf2 Try to clean up the end of tile logic 2020-03-06 09:52:28 +01:00
Patrick 'Quezler' Mounier
11fc494284 Clean up transfer code 2020-03-06 09:34:09 +01:00
Anuken
89a5c957fd add mod name to js print() (#1677)
* add mod name to js print()

* add mod name to errors
2020-03-05 15:58:10 -05:00
Patrick 'Quezler' Mounier
e05f755a4e Remove unused import 2020-03-05 21:30:18 +01:00
Patrick 'Quezler' Mounier
44bff5b7cf Remove conveyor integration remnants 2020-03-05 21:29:19 +01:00
Patrick 'Quezler' Mounier
e2b9977ebc Remove omnidirectional due to issues 2020-03-05 21:27:28 +01:00
Patrick 'Quezler' Mounier
3e51abf6eb Try to fix blending with omnidirectional 2020-03-05 21:24:51 +01:00
Patrick 'Quezler' Mounier
c1f765a467 Bodge in a rotational blend bypass 2020-03-05 20:26:34 +01:00
Patrick 'Quezler' Mounier
e67667e4a3 Remove preemtive unload 2020-03-05 20:09:09 +01:00
Patrick 'Quezler' Mounier
14a97976cc Realign pixels
Bothered me for ages.
2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
4a3e00f822 Fix early return 2020-03-05 15:21:41 +01:00
Patrick 'Quezler' Mounier
3ac50a3f3e , 2020-03-05 14:42:37 +01:00
Patrick 'Quezler' Mounier
6fb4c79f82 Fix sleeping while reloading 2020-03-05 14:29:27 +01:00