mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,906 Commits 4 Branches 160 Tags 2.3 GiB
3138f05cc2
Commit Graph

14906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
a734f8423c Fixed #7167 2022-07-12 13:50:02 -04:00
Epowerj
352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Anuken
fc5e40a857 Crash fix 2022-07-11 21:57:53 -04:00
Epowerj
b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Epowerj
458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Anuken
42ce453f11 Merge remote-tracking branch 'origin/master' 2022-07-11 18:44:54 -04:00
Anuken
4230e3b8c2 ConsumeGenerator liquidOutput -> outputLiquid 2022-07-11 18:44:49 -04:00
Epowerj
ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Anuken
72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Epowerj
735d81e42b Typo 2022-07-11 17:03:55 -04:00
Epowerj
4746cdbb6b Added description to atlas 2022-07-11 17:02:22 -04:00
Anuken
567394aced Merge remote-tracking branch 'origin/master' 2022-07-11 16:59:11 -04:00
Anuken
2fd8134700 First phase of generator cleanup 2022-07-11 16:59:07 -04:00
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Anuken
c9f24692c5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-11 14:38:00 -04:00
Anuken
411b6d7460 Shockwave tower block 2022-07-11 14:37:57 -04:00
BetaEridani
49122729af
Update bundle_fi.properties (#7163) 
Fixed some minor typos + translated names of the two new turrets.
 2022-07-11 06:44:58 -04:00
Epowerj
1124f5f369 Fixed issue with level four unlocking early 2022-07-10 17:05:23 -04:00
Github Actions
28aad7313e Automatic bundle update 2022-07-10 14:14:47 +00:00
BetaEridani
6b542ef494
Update bundle_fi.properties (#7142) 
Translated bundle_fi.properties entirely to finnish. Also fixed some grammar.
 2022-07-10 10:13:38 -04:00
Anuken
4ea1e26c73 Merge remote-tracking branch 'origin/master' 2022-07-10 07:37:06 -04:00
Anuken
55e78c9dce Minor bugfixes & requirement tweaks 2022-07-10 07:37:01 -04:00
code-explorer786
29085b95b7
Fix setblock block not accepting @air (#7160) 2022-07-09 21:21:29 -04:00
Github Actions
4bc0ce9338 Automatic bundle update 2022-07-09 20:32:32 +00:00
Jerzozwierz
1e7bd3e8f4
Big update to bundle_pl (#7159) 
Big changes to bundle_pl. Huge cleanup. The changes were consulted with translators such as Somka HybridDeathPrime. They had no objections. Polish chat had no objections. All changes were made mainly by me, ۲▁⊕ᶬṉ๏൩⁷ ©, pożeracz cukierków#2648, p0gn'1_#1415, [PL] Stalker TurTur#7069.
 2022-07-09 16:31:18 -04:00
Mythril382
af80db0dfd
SwitchBlock clickSound (#7158) 2022-07-09 11:29:39 -04:00
UnCaughT
aaf37b0be8
New HexPvP with team mechanics (#7157) 2022-07-09 11:29:27 -04:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Anuken
311118ae58 Hastily implemented final endgame turret 2022-07-09 00:33:15 -04:00
Epowerj
5d852085c2 Tweaked three 2022-07-08 18:35:56 -04:00
Epowerj
e6502dad75 Changed requirements for split 2022-07-08 18:35:47 -04:00
Anuken
8b0a86e883 oh no 2022-07-08 17:54:05 -04:00
Anuken
3da0486320 Indonesian bundle loading hack 2022-07-08 17:07:49 -04:00
Anuken
0c09c10741 Misc minor bugfixes 2022-07-08 16:38:25 -04:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Epowerj
32d586617d tweaked sector three 2022-07-07 17:03:30 -04:00
Epowerj
c2a9c77510 Added a sector description for three 2022-07-07 16:57:12 -04:00
Anuken
6f6bf0cf77 Fixed #7145 2022-07-07 16:01:13 -04:00
Anuken
64a30adb9b Fixed #7143 2022-07-07 11:09:01 -04:00
Anuken
a8a87e94be Ran update script again 2022-07-07 10:27:52 -04:00
Anuken
4c89e9d8ce Merge remote-tracking branch 'origin/master' 2022-07-07 09:53:43 -04:00
Anuken
2a3a3359fa Misc bugfixes 2022-07-07 09:53:38 -04:00
HostingAccount
9e9c9ed5ed
Hosting account patch 3 (#7134) 
* Update servers_v6.json

* Update servers_v6.json

* Update servers_v6.json

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-06 22:31:58 -04:00
Github Actions
42cd5ee12e Automatic bundle update 2022-07-07 02:10:21 +00:00
1stvaliduser
bfd41c34a4
Update bundle_uk_UA.properties (#7138) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)
 2022-07-06 22:09:27 -04:00