Commit Graph

10791 Commits

Author SHA1 Message Date
Felix Corvus
f4e666bce8 Update bundle_ru.properties 2020-08-09 10:19:02 +03:00
Anuken
4dc90d4074 Less terrible logic UI / Unary operations 2020-08-08 20:36:45 -04:00
Anuken
2042dafb73 Merge pull request #2324 from DeltaNedas/water
deep water is 2x better to pump
2020-08-08 18:48:57 -04:00
DeltaNedas
cb4c916ed7 oops 2020-08-08 23:25:02 +01:00
Anuken
da19c5ae19 Sensor types 2020-08-08 18:01:54 -04:00
ThePythonGuy
ca931987c4 Merge pull request #4 from J-VdS/patch-2
better look
2020-08-08 22:15:49 +02:00
J-VdS
f9a0d7a3c6 better look
this looks better in my opinion
2020-08-08 21:33:32 +02:00
Anuken
4008d88f0b arc 2020-08-08 14:14:58 -04:00
Anuken
0fc246cfdc Merge remote-tracking branch 'origin/master' 2020-08-08 14:14:43 -04:00
Anuken
ac46b77380 Logic progress 2020-08-08 14:14:33 -04:00
DeltaNedas
76e21fbd19 deep water is 2x better to pump 2020-08-08 18:45:25 +01:00
Anuken
1988958c4a Merge pull request #2323 from DeltaNedas/router
make distribution block fields/funcs public/protected
2020-08-08 13:38:09 -04:00
ThePythonGuy
840f6e43c3 Merge pull request #2 from Catchears/patch-1
Add german translation
2020-08-08 19:34:13 +02:00
ThePythonGuy
89872902e7 Merge pull request #3 from Remint32/patch-3
RU l10n for Mod Browser PR
2020-08-08 19:33:42 +02:00
ThePythonGuy
d6065865f5 Delete warning 2020-08-08 19:31:52 +02:00
DeltaNedas
5e5aadc4ac make distribution block fields/funcs public/protected 2020-08-08 18:23:54 +01:00
Anuken
3fbeb33390 Update CONTRIBUTING.md 2020-08-08 12:17:20 -04:00
Neba-MD
d08f9bf819 Add TWS server 2020-08-09 00:01:52 +08:00
Felix Corvus
b56aa4adc2 Update bundle_ru.properties 2020-08-08 07:58:51 +03:00
Felix Corvus
b36c074e72 RU l10n for Mod Browser PR 2020-08-08 07:56:21 +03:00
Felix Corvus
dce253e146 Update bundle_ru.properties 2020-08-08 07:31:39 +03:00
Anuken
8411cc16f1 Logic stuff 2020-08-07 23:01:40 -04:00
Anuken
51af6eeec9 Barely functional logic 2020-08-07 18:30:03 -04:00
Anuken
090e0f35dc aa 2020-08-07 17:50:54 -04:00
Anuken
33fdea7b7d Merge remote-tracking branch 'origin/master' 2020-08-07 16:11:16 -04:00
Anuken
a12211587c More logic 2020-08-07 16:11:02 -04:00
Wiki Updater
4df0393e00 Add german translation 2020-08-07 17:19:24 +02:00
Anuken
44912c0fa9 Merge pull request #2318 from Quezler/patch-42
Update servers_be.json
2020-08-07 10:52:26 -04:00
Patrick 'Quezler' Mounier
ee0b946ea6 Update servers_be.json 2020-08-07 13:47:13 +02:00
Anuken
5040eacda7 a rc 2020-08-07 00:24:54 -04:00
Anuken
ec99daaefb logic 2 2020-08-07 00:24:14 -04:00
Anuken
176e4a3bb9 Many things 2020-08-06 20:00:02 -04:00
Anuken
ac3106728f arc 2020-08-06 12:31:42 -04:00
Anuken
5dc78a24e0 Logic progress 2020-08-06 12:31:04 -04:00
Anuken
7482e2a988 Bugfixes 2020-08-05 19:52:09 -04:00
Anuken
f4a838df98 Bugfixes 2020-08-05 09:59:50 -04:00
Anuken
54d37b63b3 Bugfixes 2020-08-05 09:47:11 -04:00
Anuken
75eed2926a Start of work on logic stuff 2020-08-04 23:37:12 -04:00
Anuken
03b5bc9449 Weather status effects 2020-08-04 21:26:24 -04:00
Anuken
55903576b6 Fixed #2312 2020-08-04 17:18:19 -04:00
Anuken
d9ea17baca Fixed #2311 2020-08-04 16:49:20 -04:00
Anuken
b11908f509 Event things 2020-08-04 15:14:01 -04:00
Anuken
0d4e75fc42 Re-added remote effect methods 2020-08-04 13:38:40 -04:00
J-VdS
337d5b0531 Merge pull request #1 from Anuken/master
$ update
2020-08-04 17:33:50 +02:00
Anuken
3038862af5 '$' symbol removal 2020-08-04 10:45:55 -04:00
Anuken
f60afc39f1 Replaced '$' formatting with '@' 2020-08-04 10:18:01 -04:00
Anuken
8dd4839f53 Anuken/Mindustry-Suggestions/issues/375 2020-08-04 10:00:24 -04:00
Anuken
8b83360fe5 Fixed #2307 2020-08-04 09:10:55 -04:00
Anuken
b268e8ca58 Rand rename 2020-08-04 09:10:22 -04:00
ThePythonGuy
7bfbca7234 Update ModsDialog.java 2020-08-04 11:17:13 +02:00