mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 01:07:16 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,469 Commits 4 Branches 160 Tags 2.3 GiB
755498394d
Commit Graph

15469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
755498394d Merge remote-tracking branch 'origin/master' 2022-10-10 07:59:52 -04:00
Anuken
fd849494cc Fixed #7685 2022-10-10 07:59:47 -04:00
Epowerj
bfebe890b6 Work on siege 2022-10-09 19:47:57 -04:00
Anuken
4201106843 New WIP achievement definitions 2022-10-09 17:47:12 -04:00
Anuken
dfdb4c1c1f Moved siege map to correct folder 2022-10-09 16:31:47 -04:00
hhhi17
dafbade7a0
Siege (#7684) 
* Siege

* Siege
 2022-10-09 16:31:09 -04:00
OSP
6ec2537de1
Update NetServer.java (#7683) 2022-10-09 12:13:05 -04:00
Даркнесс#3729
19b3a939f9
Remove duplicate server (#7681) 2022-10-09 11:05:02 -04:00
Anuken
84ff0649a2 Fixed #7680 2022-10-09 10:18:14 -04:00
Anuken
2bccb1bad7 Merge remote-tracking branch 'origin/master' 2022-10-08 16:29:33 -04:00
Anuken
308219b68b Fixed #7677 2022-10-08 16:29:29 -04:00
Joan Josep
f1bf6e5e43
Update bundle_ca.properties (#7676) 2022-10-08 07:53:31 -04:00
Anuken
719a2f1419 Merge remote-tracking branch 'origin/master' 2022-10-08 07:50:26 -04:00
Anuken
09f5439c33 Fixed #7675 2022-10-08 07:50:21 -04:00
Github Actions
72b408158d Automatic bundle update 2022-10-08 00:25:32 +00:00
Epowerj
4446be612f Added crevice to campaign 2022-10-07 20:24:38 -04:00
Epowerj
09a081f44d progress on crevice 2022-10-07 19:46:49 -04:00
Epowerj
9a6ee50925 Merge remote-tracking branch 'origin/master' 2022-10-07 19:17:43 -04:00
Epowerj
13916acfce progress on crevice 2022-10-07 19:17:19 -04:00
ThatOneBepis
e9cdbf39a1
Update bundle_sr.properties (#7673) 2022-10-07 17:56:20 -04:00
Anuken
5317a81a92 Merge remote-tracking branch 'origin/master' 2022-10-07 13:41:18 -04:00
Anuken
6f1685c34d Onset extra hints 2022-10-07 13:41:13 -04:00
Nunting
2ac689aacc
Update bundle_ko.properties (#7672) 2022-10-07 11:57:49 -04:00
MEEPofFaith
e38013862b
Do not display duration for reactive statuses (#7669) 2022-10-07 07:54:01 -04:00
Mythril382
0b128e5bca
add some useful math stuff to GlobalVars (#7670) 
* VlobalGars

* E
 2022-10-07 07:49:00 -04:00
Epowerj
fb1e56a944 progress on crevice 2022-10-06 22:22:22 -04:00
Epowerj
1eb2298e3a Added wip crevice 2022-10-06 19:33:26 -04:00
Github Actions
35f4219e17 Automatic bundle update 2022-10-06 18:19:14 +00:00
Anuken
ae8f1fa5b1 Merge remote-tracking branch 'origin/master' 2022-10-06 14:18:00 -04:00
Anuken
b69cf34494 Rule cleanup/clarification 2022-10-06 14:17:55 -04:00
Github Actions
e724f025af Automatic bundle update 2022-10-06 18:15:40 +00:00
MEEPofFaith
a7c7238cc8
Whitelist Option + Hiding Banned Blocks Rules (#7553) 
* Whitelist Option

* Hide banned blocks rule
 2022-10-06 14:14:48 -04:00
Anuken
4ac3eb1c9a Fixed RTS AI targeting unreachable things 2022-10-06 14:03:57 -04:00
Anuken
718cf72912 Fixed 'core under attack' not showing up on servers 2022-10-05 13:17:39 -04:00
Anuken
5ea9c0c8dc Merge remote-tracking branch 'origin/master' 2022-10-05 06:06:40 -04:00
Anuken
f1b1009728 Made canvas block require beryllium 2022-10-05 06:06:35 -04:00
MEEPofFaith
dc060d2ce9
Deja Vu (#7662) 
I feel like this has been a problem before.
Deeper in the code.
 2022-10-05 05:47:28 -04:00
MEEPofFaith
44b73d4c13
Load bullet part regions (#7663) 
* Load bullet part regions

* Unnecessary, just use name in the part
 2022-10-05 05:47:09 -04:00
Anuken
5e6d40d6cc Heat router requirement tweak 2022-10-04 17:36:02 -04:00
Anuken
2149580aaa actually I'll just remove it and see who complains 2022-10-04 16:43:12 -04:00
Anuken
4e9c0df519 Merge remote-tracking branch 'origin/master' 2022-10-04 16:42:29 -04:00
Anuken
39e59103a5 Disable ammo rule on Erekir 2022-10-04 16:42:22 -04:00
Github Actions
e71c76956c Automatic bundle update 2022-10-04 20:19:13 +00:00
Angel-24
3c5f05d5df
Update bundle_es.properties (#7491) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-04 16:18:28 -04:00
Github Actions
a2c73a748e Automatic bundle update 2022-10-04 20:13:38 +00:00
JniTrRny
ceba055406
Update bundle_th.properties (#7200) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-04 16:12:40 -04:00
Anuken
b81378922d Merge remote-tracking branch 'origin/master' 2022-10-04 16:11:01 -04:00
Anuken
e13fcc5a5f Better #7650 2022-10-04 16:10:57 -04:00
xStaBUx
a6951dc6fb
Better AboutDialog (#7658) 2022-10-04 16:08:39 -04:00
Anuken
ca4f710ec2 Bullet parts / Improved clipping in #7282 2022-10-04 15:58:40 -04:00