mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,106 Commits 4 Branches 160 Tags 2.3 GiB
8f58f40b1a
Commit Graph

10106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolass1000
22bd64508c
Small Omura fix 2020-11-21 22:15:44 +01:00
Anuken
b09dc47aad Bugfixes / Tutorial cleanup 2020-11-21 15:50:44 -05:00
Anuken
96b55c6b1c
Merge pull request #3508 from DeltaNedas/extend 
unified extend and extendContent to work for any class
 2020-11-21 15:22:44 -05:00
Anuken
ac4a96eefb
Merge pull request #3513 from Quezler/patch-64 
Sync construction blocks
 2020-11-21 15:22:25 -05:00
Felix Corvus
1b0d2dcdc0
23 new lines 
- map.multiplayer
- hint.skip
- hint.desktopMove
- hint.zoom
- hint.mine
- hint.desktopShoot
- hint.depositItems
- hint.respawn
- hint.respawn.mobile
- hint.desktopPause
- hint.placeDrill
- hint.placeDrill.mobile
- hint.placeConveyor
- hint.placeConveyor.mobile
- hint.placeTurret
- hint.breaking
- hint.breaking.mobile
- hint.research
- hint.research.mobile
- hint.unitControl
- hint.unitControl.mobile
- hint.launch
- hint.launch.mobile
 2020-11-21 22:32:16 +03:00
Nikolass1000
cd7c90f1f6
Polish unit descriptions 2020-11-21 20:30:18 +01:00
Anuken
3b991952b1 Merge remote-tracking branch 'origin/master' 2020-11-21 14:06:06 -05:00
Anuken
6fba84959c New hint tutorial system (unfinished!) 2020-11-21 14:05:58 -05:00
YellOw139
0662fd8427
Sector not found 2020-11-21 20:55:53 +02:00
Patrick 'Quezler' Mounier
55a929010e
Remove stray newline 2020-11-21 18:51:50 +01:00
Patrick 'Quezler' Mounier
c6657109b1
Sync construction blocks 2020-11-21 16:59:09 +01:00
Nikolass1000
0422cf79b2
Polish language update. 2020-11-21 15:33:21 +01:00
Anuken
3ce6a6dea4
Merge pull request #3502 from skykatik/patch-8 
[Typo] communitycommunity servers
 2020-11-21 08:59:30 -05:00
DeltaNedas
09eed078cd unified extend and extendContent to work for any class 2020-11-21 13:04:17 +00:00
Skat
2b22170318
[Typo] communitycommunity servers 2020-11-21 10:31:10 +03:00
Felix Corvus
589971a8c3
1 new line 
sector.curlost
 2020-11-21 02:09:15 +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
Angel_24
07b12890e8
Update bundle_es.properties 2020-11-20 18:14:55 +01:00
Angel_24
c014f86f2b
Update bundle_es.properties 
"Titanium" conveyor duplicated on "Plastanium"
 2020-11-20 17:39:52 +01: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
YellOw139
88535665e8
revert 2020-11-20 07:36:11 +02:00
YellOw139
75744256f9
Brief test 2020-11-20 07:31:50 +02: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
Petr Gašparík
e700ef179e Czech translation up to commit 72d5a8a. 
Hell of a work.
 2020-11-20 00:33:13 +01: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