 Anuken
|
7aaf0f3475
|
Merge remote-tracking branch 'origin/master'
|
2025-03-09 10:19:16 -04:00 |
|
|
Anuken
|
f7b13b7924
|
Fixed mixtech vault item dupe
|
2025-03-09 10:19:09 -04:00 |
|
|
Anuken
|
46fcd7b84a
|
Fixed #10492
|
2025-02-23 01:32:40 -05:00 |
|
|
Anuken
|
11061d1dd1
|
Fixed #10502
|
2025-02-23 01:26:47 -05:00 |
|
|
Anuken
|
ed05214ea4
|
Fixed #10497
|
2025-02-23 01:22:52 -05:00 |
|
|
Anuken
|
bc350afdea
|
Network ping packet fix
|
2025-02-23 00:59:02 -05:00 |
|
|
Anuken
|
851817a049
|
Merge remote-tracking branch 'origin/master'
|
2025-02-11 11:07:59 -05:00 |
|
|
Anuken
|
9507292107
|
LCanvas cleanup
|
2025-02-11 11:07:51 -05:00 |
|
|
Anuken
|
4768bf0aeb
|
Merge branch 'master' of https://github.com/Anuken/Mindustry
|
2025-02-10 17:05:03 -05:00 |
|
|
Anuken
|
e46d1a6e6b
|
Merge branch 'MEEPofFaith-mod-dependencies'
|
2025-02-10 17:04:58 -05:00 |
|
|
Anuken
|
8efd62e668
|
PR cleanup
|
2025-02-10 17:03:46 -05:00 |
|
|
Anuken
|
5a56825801
|
Merge branch 'mod-dependencies' of https://github.com/MEEPofFaith/Mindustry into MEEPofFaith-mod-dependencies
|
2025-02-10 16:31:56 -05:00 |
|
|
Anuken
|
b0b240993c
|
arc
|
2025-02-10 16:28:40 -05:00 |
|
|
Anuken
|
4c300afab4
|
Merge branch 'Atomic-Laboratory-patch-6'
|
2025-02-10 16:28:09 -05:00 |
|
|
Anuken
|
3bdb871f10
|
Merge branch 'patch-6' of https://github.com/Atomic-Laboratory/Mindustry into Atomic-Laboratory-patch-6
|
2025-02-10 16:24:40 -05:00 |
|
 AnukenandGitHub
|
70f187d6c4
|
Update core/src/mindustry/ui/dialogs/JoinDialog.java
|
2025-02-10 16:24:20 -05:00 |
|
|
Anuken
|
e3b355b3c9
|
arc
|
2025-02-10 16:22:53 -05:00 |
|
|
Anuken
|
e95ff98abf
|
Merge remote-tracking branch 'origin/master'
|
2025-02-10 16:22:01 -05:00 |
|
|
Anuken
|
5622b295e6
|
Logic canvas fixes
|
2025-02-10 16:21:51 -05:00 |
|
|
Anuken
|
0db7c1e36a
|
Merge branch 'SomeonesShade-balancing_burst-drill-optional-multiplier'
|
2025-02-10 15:53:54 -05:00 |
|
|
Anuken
|
79a9a446c4
|
PR cleanup
|
2025-02-10 15:53:46 -05:00 |
|
|
Anuken
|
fec91eb157
|
Merge branch 'balancing_burst-drill-optional-multiplier' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing_burst-drill-optional-multiplier
|
2025-02-10 15:51:47 -05:00 |
|
|
Anuken
|
084e97ceab
|
Merge branch 'code-explorer786-logic-jumps'
|
2025-02-10 15:51:17 -05:00 |
|
|
Anuken
|
9a9e4611cd
|
Logic jump PR cleanup
|
2025-02-10 15:51:02 -05:00 |
|
|
Anuken
|
27bc2918fd
|
Uncomment flaky test
|
2025-02-10 14:52:40 -05:00 |
|
|
AnukenandGitHub
|
7a6222aa18
|
Revert "Allow markers to be used as light sources (#9733)" (#10490)
This reverts commit 8626082068.
|
2025-02-10 14:24:46 -05:00 |
|
|
Anuken
|
a3987fde71
|
More base schematics
|
2025-02-10 14:00:44 -05:00 |
|
|
Anuken
|
c32b304c78
|
Sync core units with spawner block database tab
|
2025-02-10 13:50:27 -05:00 |
|
|
Anuken
|
90dc291b66
|
Unit assembler shader fix
|
2025-02-09 22:12:59 -05:00 |
|
|
Anuken
|
d20f9ebb17
|
Support for sector presets without unlock requirements
|
2025-02-09 15:52:30 -05:00 |
|
|
Anuken
|
f77803dffc
|
Merge remote-tracking branch 'origin/master'
|
2025-02-09 13:05:59 -05:00 |
|
|
Anuken
|
8ee00e0c3a
|
Fixed broken team palettes
|
2025-02-09 13:05:51 -05:00 |
|
|
Anuken
|
3378475f6a
|
Closes #6940
|
2025-02-09 11:49:26 -05:00 |
|
|
Anuken
|
3246c0c39b
|
Configurable block build time
|
2025-02-09 11:24:34 -05:00 |
|
|
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 |
|