Commit Graph

8107 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Anuken
7ecd8b3169 Merge remote-tracking branch 'origin/master' 2020-08-03 22:53:45 -04:00
Anuken
2466267b1c Multi-target AI 2020-08-03 22:53:35 -04:00
Anuken
49f6b9bb05
Update README.md 2020-08-03 21:57:20 -04:00
Anuken
10cacf71ae
Merge pull request #2305 from DeltaNedas/modsuifix
fix some issues with mods ui
2020-08-03 21:11:50 -04:00
DeltaNedas
1589b8a72b
grow each mod 2020-08-04 01:46:26 +01:00
DeltaNedas
e78948e548 fix some issues with mods ui 2020-08-04 01:44:05 +01:00
Anuken
b1da2faa04 Flying boss tweaks 2020-08-03 10:51:10 -04:00
Anuken
3966ff6817 Boss weapon tweaks 2020-08-02 21:54:33 -04:00
HAJDog247
b1bf96bfff
Update bundle_fil.properties 2020-08-03 07:51:22 +08:00
Anuken
f97d1eedee Fixed #2300 2020-08-02 10:35:50 -04:00
Anuken
a7c0f9e73c Antumbra weapons 2020-08-01 21:52:12 -04:00
grimsoul10
8c3c671dcd
Update bundle_in_ID.properties
A Little bit update 5%
2020-08-01 23:41:23 +00:00