mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-22 10:17:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,870 Commits 4 Branches 160 Tags 2.3 GiB
3ce6a6dea4
Commit Graph

9870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
3ce6a6dea4
Merge pull request #3502 from skykatik/patch-8 
[Typo] communitycommunity servers
 2020-11-21 08:59:30 -05:00
Skat
2b22170318
[Typo] communitycommunity servers 2020-11-21 10:31:10 +03:00
Anuken
522a7f4728 Fixed #3493 but for point defense turrets 2020-11-20 12:53:51 -05:00
Anuken
06921b53be Fixed #3493 2020-11-20 12:53:09 -05:00
Anuken
1372fc4079 Fixed sector gameover ghost bug 2020-11-20 12:38:16 -05:00
Anuken
aa2783a885 Testing higher build numbers 2020-11-20 11:26:49 -05:00
Anuken
dbc0e6751b Merge remote-tracking branch 'origin/master' 2020-11-20 11:23:35 -05:00
Anuken
814065bf8e Removed Rules#tutorial 2020-11-20 11:23:30 -05:00
Anuken
3e5d5e4064
Merge pull request #3483 from skykatik/patch-7 
Added missed log argument
 2020-11-20 10:31:35 -05:00
Anuken
139fa329d4 Merge remote-tracking branch 'origin/master' 2020-11-20 09:13:40 -05:00
Anuken
abdccbb1bd Fixed #3487 / Fixed #3484 2020-11-20 09:13:36 -05:00
Anuken
0e4ec86f34
Merge pull request #3482 from Quezler/patch-59 
Remove double whiteline from under package
 2020-11-20 09:05:07 -05:00
Skat
67dcc28312
Update ServerControl.java 2020-11-20 12:58:46 +03:00
Patrick 'Quezler' Mounier
2d06495472
Remove double whiteline from under package 2020-11-20 10:55:01 +01:00
Anuken
a0f1f52a8b CI cleanup 2020-11-19 19:44:49 -05:00
Anuken
b1ace4a7c9 CI cleanup 2020-11-19 19:39:40 -05:00
Anuken
8214188215 CI cleanup 2020-11-19 19:32:27 -05:00
Anuken
07ddf806ac CI cleanup 2020-11-19 19:27:21 -05:00
Anuken
8bd2b9b45c CI cleanup 2020-11-19 19:26:10 -05:00
Anuken
4e9b07d8e2 CI cleanup 2020-11-19 18:54:28 -05:00
Anuken
a7aad1a1f9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.github/workflows/gradle.yml
 2020-11-19 18:53:15 -05:00
Anuken
f71b726877 Testing Github Actions CI 2020-11-19 18:53:02 -05:00
Anuken
ffcda6d246
Merge pull request #3470 from Quezler/patch-58 
Allow for plugins to trigger the same alerts as sectors and guardians
 2020-11-19 16:17:04 -05:00
Anuken
4d113a6aac
Merge pull request #3472 from DeltaNedas/buildpr 
upload pr jar
 2020-11-19 15:13:58 -05:00
Patrick 'Quezler' Mounier
a6d1ac0b86
Use icon font in favor of def 2020-11-19 21:08:07 +01:00
Patrick 'Quezler' Mounier
637cca2e66
Probably one more 2020-11-19 20:50:14 +01:00
Patrick 'Quezler' Mounier
72136ebea3
Or is it? 2020-11-19 20:36:58 +01:00
Patrick 'Quezler' Mounier
ce045a470a
Update NetClient.java 2020-11-19 20:34:49 +01:00
DeltaNedas
647911725b compile the jar first 2020-11-19 19:34:16 +00:00
DeltaNedas
61582fed3a upload pr jar 2020-11-19 19:15:23 +00:00
Patrick 'Quezler' Mounier
07893eee9c
Allow for plugins to trigger the same alerts as sectors and guardians 2020-11-19 19:50:30 +01:00
Anuken
15ef32447c Merge remote-tracking branch 'origin/master' 2020-11-19 13:31:03 -05:00
Anuken
aef6ac4335 Made RepairAI only move toward ally buildings 2020-11-19 13:30:59 -05:00
Anuken
d63efb1ff0
Merge pull request #3467 from Quezler/patch-57 
Give some techtree brackets a new line
 2020-11-19 12:45:05 -05:00
Anuken
f4c69372c9
Merge pull request #3468 from skykatik/patch-6 
Remove space in ban message & added @ for argument
 2020-11-19 12:44:52 -05:00
Skat
16adbd667d
Update ServerControl.java 2020-11-19 20:40:00 +03:00
Patrick 'Quezler' Mounier
dd9b85f79b
Give some techtree brackets a new line 2020-11-19 18:32:03 +01:00
Anuken
c468bdef6d Merge remote-tracking branch 'origin/master' 2020-11-19 12:31:31 -05:00
Anuken
97c3d36bae Re-added preloading of ground enemy path / Core unit casing FX 2020-11-19 12:31:27 -05:00
Anuken
9033683e15
Merge pull request #3466 from Quezler/patch-55 
Remove leading space from console kick message
 2020-11-19 12:22:49 -05:00
Patrick 'Quezler' Mounier
1c48bc786b
Remove leading space from console kick message 2020-11-19 18:21:17 +01:00
Anuken
7612a22480 Implemented legacy (V5) research loading 2020-11-19 11:55:46 -05:00
Anuken
bbc8c05f93
Merge pull request #3354 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-19 10:39:15 -05:00
Anuken
bfbb082fd8
Merge pull request #3393 from Prosta4okua/patch-8 
Ukrainian translation
 2020-11-19 10:37:05 -05:00
Anuken
89ef2ac4d3 Naval research requirements for final sector 2020-11-19 10:23:46 -05:00
Anuken
506175212c Merge remote-tracking branch 'origin/master' 2020-11-19 10:14:49 -05:00
Anuken
b57b1966a7 Switched to ALSA Soloud backend / Fixed sound muffling at start 2020-11-19 10:14:44 -05:00
Anuken
08a50edb23
Merge pull request #3456 from DeltaNedas/mapsize 
add @mapx/y to logic processor
 2020-11-19 10:12:32 -05:00
Anuken
95c242a2e1 Fixed final sector missing waves / Fixed audio not working on Android 2020-11-19 09:43:15 -05:00
Felix Corvus
49a1a0b768
5 new lines; 1 line changed 
New:

- indev.campaign
- launch.from
- sector.planetaryTerminal.name
- block.interplanetary-accelerator.name
- block.interplanetary-accelerator.description

Changed:

- sector.extractionOutpost.name
 2020-11-19 17:43:08 +03:00