Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,538 Commits 4 Branches 180 Tags
e6de58fbdce08be1ea141ef012eb5b6be1b469b5
Commit Graph

13141 Commits

Author SHA1 Message Date
Epowerj
232784a4ff Progress on stronghold 2022-09-24 00:35:07 -04:00
Anuken
b26f7625d8 Cleanup 2022-09-23 16:24:51 -04:00
hortiSquash
1d971231ca Support of mods with textures in different resolution (HD or low-res) (#7602) 
* HDustry - scl() & private map

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* MEEP stop doing stuff when i work

<3 <3

* Replaced Draw.scl

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-09-23 16:21:53 -04:00
Anuken
8b9cbc2c7c BuildVisibility non-enum / Canvas is now shown 2022-09-23 12:27:44 -04:00
Anuken
710fd3484f Fixed #7607 2022-09-22 09:32:08 -04:00
Anuken
301e570068 Merge remote-tracking branch 'origin/master' 2022-09-21 12:42:15 -04:00
Anuken
e56f207160 Moved logo back over menu 2022-09-21 12:42:10 -04:00
Github Actions
45c032c1cc Automatic bundle update 2022-09-21 04:13:04 +00:00
Jerzozwierz
dbf7902046 Update to bundle.pl (#7549) 
Translation was made by me and ܇۲▁⊕ᶬṉ๏൩⁷ , pożeracz cukierków#2648

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-09-21 00:12:05 -04:00
Epowerj
69cc5aafad Progress on stronghold 2022-09-20 22:52:35 -04:00
Anuken
4c8c0efd0c Made Corvus/Vela no longer stop to shoot with command AI 2022-09-20 22:51:38 -04:00
Anuken
9b7ac713ee DefenderAI tweaks 2022-09-20 21:54:57 -04:00
Anuken
f75c54952a Merge remote-tracking branch 'origin/master' 2022-09-20 21:50:49 -04:00
Anuken
7f5095921a Mod pregenerated meta option 2022-09-20 21:50:44 -04:00
Epowerj
aa253e059d Progress on stronghold 2022-09-20 17:13:46 -04:00
ThatOneBepis
2cd85e6cc5 update bundle_sr.properties (#7544) 
* Update bundle_sr.properties

* Update bundle_sr.properties

* Dorada od Bodež u Nož (dođe na isto)
 2022-09-20 15:53:09 -04:00
Anuken
ac93539a5c Merge remote-tracking branch 'origin/master' 2022-09-20 15:27:17 -04:00
Anuken
7aaf5e477b Fixed treads on modded units 2022-09-20 15:27:11 -04:00
Mnemotechnican
10d989fbc2 Support for custom menu buttons (#7595) 
* added support for custom main menu buttons

* layout fix

* ...and yet another fix

* removed another unneccesary table, which was causing issues

* actually, it looks better with even and odd buttons swapped

* made the container a scroll pane, needs some testing...

* this seems to work correctly

* render the logo under the menu buttons

* rename Buttoni to MenuButton
 2022-09-20 11:25:56 -04:00
Nunting
057f1ee446 Update bundle_ko.properties (#7598) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-09-20 10:35:52 -04:00
MEEPofFaith
a8bed595c3 Fix Variable Reactor power output (#7600) 2022-09-20 08:43:05 -04:00
Anuken
3eb6061358 Slightly better planet icon 2022-09-19 11:37:47 -04:00
Anuken
51bb41f80d Merge remote-tracking branch 'origin/master' 2022-09-19 10:59:46 -04:00
Anuken
b1f5219b04 what on earth is wrong with jitpack this time 2022-09-19 10:59:41 -04:00
Github Actions
5f0611a945 Automatic bundle update 2022-09-19 03:34:51 +00:00
Anuken
e4fe0c24c1 Merge remote-tracking branch 'origin/master' 2022-09-18 23:33:57 -04:00
Anuken
cbd38003b1 Added initial campaign selection dialog 2022-09-18 23:33:47 -04:00
Mythril382
991d98b718 add a display field to weapons just like abilities (#7591) 
* weapo

* that
 2022-09-18 07:50:27 -04:00
buthed010203
d66a3b80ae Fix javaPath not looking for .exe (#7590) 
I never tested this on windows and finally decided to get to the bottom of all the weird reports ive been getting
 2022-09-17 22:37:00 -04:00
Anuken
5117a5bd71 Merge remote-tracking branch 'origin/master' 2022-09-17 22:36:44 -04:00
Anuken
c46c99bb08 Fixed #7589 2022-09-17 22:36:40 -04:00
xem8k5
f39d30903a Update bundle_zh_CN.properties (#7481) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* 从我的pr同步

一些其他的翻译改进。这个merge以后我的那个pr应该就可以关了。

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

Co-authored-by: SoMall-dumpling <57857764+SoMall-dumpling@users.noreply.github.com>
 2022-09-17 08:36:37 -04:00
Anuken
c0c4d5d97c Merge remote-tracking branch 'origin/master' 2022-09-16 19:36:07 -04:00
Anuken
53483f939c Louder UI button noise (by 'popular' demand) 2022-09-16 19:36:03 -04:00
Epowerj
6a8ae5c24e Progress on stronghold 2022-09-16 12:46:29 -04:00
MEEPofFaith
9d6b08a15d Hide Items on Planets Field (#7550) 
* Hide item on planet field

* Better name, Planet[] instead of String[]

* a
 2022-09-16 12:20:43 -04:00
Anuken
2c00365701 Merge remote-tracking branch 'origin/master' 2022-09-16 11:22:52 -04:00
Anuken
bdf3bea2a4 Tantros is hidden now 2022-09-16 11:22:47 -04:00
Joan Josep
0811e52618 Update bundle_ca.properties (#7552) 2022-09-16 10:58:12 -04:00
Vojtak42
cd234f03f4 Added \n and translated sentence (#7569) 
* Added \n

* Update bundle_cs.properties

* Update bundle_cs.properties
 2022-09-16 10:57:14 -04:00
Anuken
942a3796d7 Hide missiles on minimap 2022-09-16 08:59:28 -04:00
Anuken
b28b628b17 Merge remote-tracking branch 'origin/master' 2022-09-15 17:06:41 -04:00
Anuken
a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
Epowerj
faa785cda7 Fixed factory issues in caldera 2022-09-15 15:58:07 -04:00
Anuken
e6213dd7b4 "Name"? 2022-09-14 20:46:35 -04:00
Epowerj
f2d0eb04dd Fixed exploit in peaks 2022-09-14 20:42:38 -04:00
Epowerj
ef4038c63c Progress on stronghold 2022-09-14 20:31:30 -04:00
Epowerj
89ad8c1ea6 Progress on stronghold 2022-09-14 20:16:00 -04:00
Epowerj
cafe006860 Added stronghold WiP 2022-09-14 19:51:49 -04:00
Anuken
ad858c74ad Merge remote-tracking branch 'origin/master' 2022-09-14 19:39:14 -04:00