Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-06 12:57:17 +03:00
Code Issues Projects Releases Wiki Activity
14,973 Commits 4 Branches 160 Tags 2.1 GiB
06e08c1074
Commit Graph

14973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Anuken
cd67e70ada Fixed tests 2022-07-14 15:40:21 -04:00
Anuken
67da71b0f0 Merge branch 'maps' of https://github.com/Anuken/Mindustry 2022-07-14 15:32:33 -04:00
Anuken
f32e39fb86 WIP unit tether component 2022-07-14 15:32:23 -04:00
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj
f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj
9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj
251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj
43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj
a68b2fad11 Fixed research tree issue that prevented unlocking split 2022-07-14 14:49:41 -04:00
Anuken
9dce4f36f7 Collaris tweaks 2022-07-14 10:06:15 -04:00
Anuken
62332fbebb WIP chnages to collaris weapon 2022-07-13 22:57:13 -04:00
Epowerj
3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj
24e70faf02 Start reworking split 2022-07-12 20:37:17 -04:00
Epowerj
e79763d139 Changed payload build requirements 2022-07-12 20:36:57 -04:00
Epowerj
ecc9dd7a7f Made reinforced container cheaper and smaller 2022-07-12 19:03:23 -04:00
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