 Anuken
|
e77708b55b
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2025-02-09 11:20:04 -05:00 |
|
|
Anuken
|
925bfad30f
|
Merge branch 'MEEPofFaith-mining-beam-weapon'
|
2025-02-09 11:19:47 -05:00 |
|
|
Anuken
|
0b09d0438a
|
I'll do it myself
|
2025-02-09 11:19:31 -05:00 |
|
|
Anuken
|
02d56d27db
|
Merge branch 'mining-beam-weapon' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mining-beam-weapon
|
2025-02-09 11:18:16 -05:00 |
|
|
Anuken
|
e57e47617c
|
Closes #10302
|
2025-02-09 11:15:33 -05:00 |
|
|
Anuken
|
c3aabdcfc5
|
Closes #9498
|
2025-02-09 11:09:11 -05:00 |
|
|
Anuken
|
f6e9cffa9c
|
Fixed #10484
|
2025-02-09 10:00:27 -05:00 |
|
|
Anuken
|
63568c5b34
|
Merge branch 'way-zer-pr-readwrite'
|
2025-02-09 00:40:34 -05:00 |
|
|
Anuken
|
44cd05f8b6
|
Privileged read/write fix
|
2025-02-09 00:40:29 -05:00 |
|
 AnukenandGitHub
|
b0f27c94bc
|
Merge branch 'master' into pr-readwrite
|
2025-02-09 00:38:18 -05:00 |
|
|
Anuken
|
4183a2a485
|
Minor chat formatting improvements for desktop typing
|
2025-02-09 00:11:26 -05:00 |
|
|
Anuken
|
aaf335d06c
|
Closes #9903
|
2025-02-09 00:03:05 -05:00 |
|
|
Anuken
|
7dedf6c488
|
Misconfigured planet crash fix
|
2025-02-08 23:41:51 -05:00 |
|
|
Anuken
|
931f5fd8ec
|
Minor color tweak
|
2025-02-08 23:38:14 -05:00 |
|
|
Anuken
|
19998b7e7f
|
Merge branch 'nullotte-master'
|
2025-02-08 23:37:15 -05:00 |
|
|
Anuken
|
96b2f14426
|
Conflicts resolved
|
2025-02-08 23:37:09 -05:00 |
|
|
Anuken
|
aba9041fce
|
Merge branch 'antsif-a-port-field'
|
2025-02-08 23:35:23 -05:00 |
|
|
Anuken
|
48afcddf1a
|
Cleanup
|
2025-02-08 23:35:07 -05:00 |
|
|
Anuken
|
03c3414305
|
Merge branch 'port-field' of https://github.com/antsif-a/Mindustry into antsif-a-port-field
|
2025-02-08 23:26:40 -05:00 |
|
|
Anuken
|
5cbb358522
|
Checked button fix
|
2025-02-08 21:43:34 -05:00 |
|
|
Anuken
|
5cdee0e765
|
Allow commanding while planning on mobile
|
2025-02-08 21:41:36 -05:00 |
|
|
Anuken
|
a77f64f2d0
|
Cleanup 2
|
2025-02-08 21:28:02 -05:00 |
|
|
Anuken
|
5bb0951422
|
Merge remote-tracking branch 'origin/master'
|
2025-02-08 21:22:06 -05:00 |
|
|
Anuken
|
e7c3c1f898
|
Cleanup
|
2025-02-08 21:21:59 -05:00 |
|
|
AnukenandGitHub
|
f8ff370dbe
|
Merge branch 'master' into port-field
|
2025-02-08 19:36:26 -05:00 |
|
|
Anuken
|
b96191f6d6
|
Closes #8590
|
2025-02-08 19:33:23 -05:00 |
|
|
Anuken
|
ebaf88e80d
|
Fixed logic IDs not loading / Accelerator animation tweaks
|
2025-02-08 16:04:04 -05:00 |
|
|
Anuken
|
f8b6600fe7
|
Closes #5033
|
2025-02-08 10:48:44 -05:00 |
|
|
Anuken
|
2868dbadd1
|
Merge remote-tracking branch 'origin/master'
|
2025-02-08 10:22:32 -05:00 |
|
|
Anuken
|
e34c8f58a0
|
Closes #7473
|
2025-02-08 10:22:25 -05:00 |
|
|
Anuken
|
ce5bca120a
|
Fixed #10475
|
2025-02-08 10:15:00 -05:00 |
|
|
Anuken
|
c032a6ebb4
|
Merge remote-tracking branch 'origin/master'
|
2025-02-08 00:08:04 -05:00 |
|
|
Anuken
|
710895fab5
|
Closes #9664
|
2025-02-08 00:07:58 -05:00 |
|
|
Anuken
|
49f68be2cb
|
Closes #6790
|
2025-02-07 21:19:25 -05:00 |
|
|
Anuken
|
88cfb10621
|
Fixed #10474
|
2025-02-07 20:49:21 -05:00 |
|
|
Anuken
|
28283b45e4
|
Merge remote-tracking branch 'origin/master'
|
2025-02-07 16:56:05 -05:00 |
|
|
Anuken
|
d5bf4f46e8
|
Console injection fix
|
2025-02-07 16:55:57 -05:00 |
|
|
Anuken
|
c100d8c13c
|
Fixed #10467
|
2025-02-06 23:58:32 -05:00 |
|
|
Anuken
|
423d635efe
|
More base generation fixes
|
2025-02-06 23:11:11 -05:00 |
|
|
Anuken
|
eaaa4f9bd8
|
Possible door config fix
|
2025-02-06 21:05:49 -05:00 |
|
|
Anuken
|
e630f21aae
|
Base part fixes
|
2025-02-06 20:44:25 -05:00 |
|
|
Anuken
|
5fca75734c
|
Closes #9314
|
2025-02-06 17:15:40 -05:00 |
|
|
Anuken
|
7fd9c2c8cc
|
Merge remote-tracking branch 'origin/master'
|
2025-02-06 16:58:46 -05:00 |
|
|
Anuken
|
393694aa7d
|
Cleanup
|
2025-02-06 16:58:40 -05:00 |
|
|
Anuken
|
5f1271e659
|
More base parts from Skeledragon
|
2025-02-06 16:50:13 -05:00 |
|
|
Anuken
|
8bd567c401
|
Closes #7746
|
2025-02-06 16:49:35 -05:00 |
|
|
Anuken
|
9f4b66a316
|
PR cleanup
|
2025-02-06 16:44:36 -05:00 |
|
|
Anuken
|
67ba6e2914
|
Closes #8520
|
2025-02-06 16:21:53 -05:00 |
|
|
Anuken
|
d08d17a309
|
Cleanup
|
2025-02-06 15:52:20 -05:00 |
|
|
Anuken
|
7c17a3c6e3
|
Merge remote-tracking branch 'origin/master'
|
2025-02-06 14:40:49 -05:00 |
|
|
Anuken
|
b874da3b71
|
Inject convenience variables into console invocations
|
2025-02-06 14:40:38 -05:00 |
|
|
Anuken
|
4ea51bccc1
|
Merge remote-tracking branch 'origin/master'
|
2025-02-06 14:27:43 -05:00 |
|
|
Anuken
|
588faad6f9
|
Rule for extra core no-build radius per-team
|
2025-02-06 14:27:35 -05:00 |
|
|
Anuken
|
dad69a7b2a
|
Merge remote-tracking branch 'origin/master'
|
2025-02-06 13:37:04 -05:00 |
|
|
Anuken
|
614744085a
|
Cleanup
|
2025-02-06 13:36:57 -05:00 |
|
|
Anuken
|
de8087e1af
|
Merge remote-tracking branch 'origin/master'
|
2025-02-06 13:11:15 -05:00 |
|
|
Anuken
|
58ea97da1c
|
Closes #5822
|
2025-02-06 13:11:06 -05:00 |
|
|
Anuken
|
17163c2645
|
Merge branch 'MEEPofFaith-power-gen-stats'
|
2025-02-06 12:18:07 -05:00 |
|
|
Anuken
|
3ec6a74c1f
|
Merge
|
2025-02-06 12:17:56 -05:00 |
|
|
Anuken
|
8aa1a9dbed
|
Merge remote-tracking branch 'origin/master'
|
2025-02-06 11:34:58 -05:00 |
|
|
Anuken
|
3edbec5275
|
Closes #9956
|
2025-02-06 11:34:52 -05:00 |
|
|
Anuken
|
9a60275652
|
Closes #10014
|
2025-02-06 11:30:34 -05:00 |
|
|
Anuken
|
10c032b3c4
|
Merge remote-tracking branch 'origin/master'
|
2025-02-05 20:22:27 -05:00 |
|
|
Anuken
|
9a8ae81af2
|
Allow landing pad config in more situations / Small power node build time increase
|
2025-02-05 20:22:19 -05:00 |
|
|
Anuken
|
0377ef3a08
|
Merge remote-tracking branch 'origin/master'
|
2025-02-05 19:44:31 -05:00 |
|
|
Anuken
|
2e19fbf417
|
Closes #7921
|
2025-02-05 19:44:24 -05:00 |
|
|
Anuken
|
571b87aaa3
|
Closes #10167
|
2025-02-05 18:53:19 -05:00 |
|
|
Anuken
|
28221246cb
|
Merge remote-tracking branch 'origin/master'
|
2025-02-05 18:52:09 -05:00 |
|
|
Anuken
|
fbc0518911
|
Closes #10400
|
2025-02-05 18:52:02 -05:00 |
|
|
Anuken
|
52268e3247
|
Merge remote-tracking branch 'origin/master'
|
2025-02-05 18:47:23 -05:00 |
|
|
Anuken
|
2665599520
|
Closes #10440
|
2025-02-05 18:47:16 -05:00 |
|
|
Anuken
|
8afe204a66
|
Merge remote-tracking branch 'origin/master'
|
2025-02-05 11:54:14 -05:00 |
|
|
Anuken
|
d01bc95c05
|
Allow team lookup
|
2025-02-05 11:54:07 -05:00 |
|
|
Anuken
|
c08ebc149a
|
Revert "Make liquid production blocks dump as much output as possible"
This reverts commit 574ae0bf
|
2025-02-05 10:24:44 -05:00 |
|
|
Anuken
|
389195074c
|
Erekir liquid block health increase
|
2025-02-04 22:41:05 -05:00 |
|
|
Anuken
|
fbe071832f
|
More liquid capacity adjustments
|
2025-02-04 22:31:55 -05:00 |
|
|
Anuken
|
8f0ce318b2
|
Increased capacity for most liquid transport blocks
|
2025-02-04 22:17:59 -05:00 |
|
|
Anuken
|
54b0bd0b46
|
oops
|
2025-02-04 20:45:55 -05:00 |
|
|
Anuken
|
0e992f9bc0
|
Merge remote-tracking branch 'origin/master'
|
2025-02-04 20:40:40 -05:00 |
|
|
Anuken
|
574ae0bfb1
|
Make liquid production blocks dump as much output as possible
|
2025-02-04 20:40:31 -05:00 |
|
|
Anuken
|
6ed9bc0ea6
|
Closes #8027
|
2025-02-04 15:44:57 -05:00 |
|
|
Anuken
|
1bda606ec9
|
Various new base parts, most submitted by Skeledragon
|
2025-02-04 15:11:19 -05:00 |
|
|
Anuken
|
0826a6edfe
|
Merge remote-tracking branch 'origin/master'
|
2025-02-04 14:49:38 -05:00 |
|
|
Anuken
|
b96e93917c
|
Cleanup
|
2025-02-04 14:49:30 -05:00 |
|
|
Anuken
|
0bb5e00ed4
|
Revert "Easier access to adding custom buttons to existing vanilla menu categories. (#9835)"
This reverts commit c5cd3e32f8.
|
2025-02-04 14:21:55 -05:00 |
|
|
Anuken
|
92a95e8fdc
|
Merge remote-tracking branch 'origin/master'
|
2025-02-04 14:17:48 -05:00 |
|
|
Anuken
|
37d0ba65e0
|
Closes #8467
|
2025-02-04 14:17:40 -05:00 |
|
|
Anuken
|
fb5945f1e8
|
Place base battery schematics with full charge / Exclude fallback sprites from assetsJar
|
2025-02-04 12:18:04 -05:00 |
|
|
Anuken
|
9f03050d04
|
Allow launch/landing pads outside of campaign as voids/sources
|
2025-02-03 21:55:33 -05:00 |
|
|
Anuken
|
0afa47c18d
|
Merge remote-tracking branch 'origin/master'
|
2025-02-03 20:15:07 -05:00 |
|
|
Anuken
|
024a084a7a
|
Fixed #10461
|
2025-02-03 20:14:59 -05:00 |
|
|
Anuken
|
8a49935bd6
|
Merge remote-tracking branch 'origin/master'
|
2025-02-03 19:27:16 -05:00 |
|
|
Anuken
|
4e225f9190
|
Internal support for legacy launch pads (hidden)
|
2025-02-03 19:27:08 -05:00 |
|
|
Anuken
|
55e32f9580
|
Fixed some landing pad state not saving / Renamed pad 'heat' to 'cooldown'
|
2025-02-02 23:19:43 -05:00 |
|
|
Anuken
|
4682940411
|
Merge remote-tracking branch 'origin/master'
|
2025-02-02 20:33:19 -05:00 |
|
|
Anuken
|
ccda69bda0
|
Minor launch/landing pad tweaks/fixes
|
2025-02-02 20:33:12 -05:00 |
|
|
Anuken
|
c1cd4c23f9
|
Merge remote-tracking branch 'origin/master'
|
2025-02-02 18:15:42 -05:00 |
|
|
Anuken
|
e4d56d8ce8
|
Fixed #10455
|
2025-02-02 18:15:34 -05:00 |
|
|
Anuken
|
d337c91395
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2025-02-02 18:10:19 -05:00 |
|
|
Anuken
|
7aee34bafa
|
Finalized launch pad mechanics
|
2025-02-02 18:10:15 -05:00 |
|