mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,781 Commits 4 Branches 160 Tags 2.3 GiB
1be91961d6
Commit Graph

10781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
475bef1d78 Fixed sprite antialiasing 2020-12-15 17:43:01 -05:00
Anuken
dd9095bfba Cleanup 2020-12-15 15:31:45 -05:00
Anuken
50125166a6 Merge remote-tracking branch 'origin/master' 2020-12-15 15:24:14 -05:00
Anuken
47e321f57d Removed atlas outputs 2020-12-15 15:24:09 -05:00
Recessive
144751bdce
Update servers_v6.json (#3983) 
Added {AA} Assault
 2020-12-15 14:28:52 -05:00
L0615T1C5-216AC-9437
6cc3676f5e
Final addition to the CN Network (#3986) 
introducing a new unique game mode, Mech-Battles, were players fight against each other.
 2020-12-15 14:28:36 -05:00
Anuken
6ab96e2787 Fixed #3987 2020-12-15 14:15:06 -05:00
Anuken
659c481c83 cleanup 2020-12-15 11:15:39 -05:00
Anuken
a18e1854ab Null checks & cleanup of upgrade pathing 2020-12-15 10:58:03 -05:00
Anuken
6c67dc1266 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-15 10:52:38 -05:00
Slava0135
0c581c520f
Conveyor upgrade system (#3912) 
* conveyor/conduit upgrading system

* style
 2020-12-15 10:52:20 -05:00
Anuken
c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Somka000
4b1c55b876
Update server (#3984) 2020-12-15 09:59:46 -05:00
Anuken
5ab090f28d Merge remote-tracking branch 'origin/master' 2020-12-14 22:56:06 -05:00
Anuken
8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Fernando
3cb0cc9a3c
Brazil is under maintenance (#3898) 
We will be back later
 2020-12-14 20:07:02 -05:00
Anuken
ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken
0512e54df5 Merge remote-tracking branch 'origin/master' 2020-12-14 13:42:52 -05:00
Anuken
cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
L0615T1C5-216AC-9437
1c6ebd3f6a
retire CN from v5 Mindustry (#3977) 2020-12-14 13:31:41 -05:00
Anuken
16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken
889c53dc1b
Update SERVERLIST.md 2020-12-14 13:26:42 -05:00
Anuken
f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -05:00
Skat
aee5d46dfa
Code formatting (#3904) 2020-12-13 23:56:13 -05:00
alex
6286b0b275
Add ALEX v6 servers to servers_v6.json (#3927) 2020-12-13 23:52:15 -05:00
Sharlotte
5223a89bf1
Update bundle_ko.properties (#3953) 
fix some miss-translation
add translated values
 2020-12-13 23:47:00 -05:00
YellOw139
5b11dbc085
[Bundle][RO] Translation Update (#3957) 
This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 98c4ee6e74
- Typo fixes & various other improvements
 2020-12-13 23:46:50 -05:00
GamyGamer
df1f8b8bb4
Update bundle_pl.properties (#3964) 
Added missing lines and fixed typo
 2020-12-13 23:46:39 -05:00
DeltaNedas
ffa7256e5a
add ContentInitEvent (#3951) 
* add ContentInit(ialized)Event

* a

* a
 2020-12-13 23:43:27 -05:00
Anuken
bbf84185cc Fixed #3973 2020-12-13 23:40:06 -05:00
Anuken
901c23f295 Fixed #3969 2020-12-13 18:01:22 -05:00
Anuken
1c8d368d3b Merge remote-tracking branch 'origin/master' 2020-12-13 16:28:32 -05:00
Anuken
37ebae20d7 Removed tools.jar 2020-12-13 16:28:29 -05:00
Anuken
e25f0c6ae2
Merge pull request #3967 from DeltaNedas/version 
disallow descriptions after mod version
 2020-12-13 16:26:23 -05:00
Anuken
484b480076 Fixed #3968 2020-12-13 16:25:36 -05:00
DeltaNedas
926497ba77 disallow descriptions after mod version 2020-12-13 19:30:21 +00:00
Anuken
ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -05:00
Anuken
d6546a38c0 #3830 2020-12-12 18:49:24 -05:00
Anuken
d171048004
Merge pull request #3950 from Auswaschbar/master 
Fix units aiming sidewards missing their aim
 2020-12-12 16:47:01 -05:00
Karl-Robert Ernst
4aebba0a0c fix units aiming sidewards missing their aim 2020-12-12 22:11:19 +01:00
Anuken
8afb6006ce
Merge pull request #3941 from DeltaNedas/public 
make some proc stuff public
 2020-12-12 13:27:22 -05:00
Anuken
d117eb249e Merge remote-tracking branch 'origin/master' 2020-12-12 13:26:34 -05:00
Anuken
768d14088a Fixed #3943 2020-12-12 13:26:30 -05:00
Anuken
86f16bfc94
Merge pull request #3934 from LottieVixen/fix-issue 
fixed an error in global.js
 2020-12-12 11:31:36 -05:00
Anuken
8fa6b76bf9 Fixed #3936 2020-12-12 11:14:17 -05:00
DeltaNedas
19af1a0cc8 make some proc stuff public 2020-12-12 15:57:43 +00:00
Charlotte Lily-Llaitchee Vixen
409d27e3df found more occurances of the error 2020-12-12 07:23:23 +00:00
Charlotte Lily-Llaitchee Vixen
d47abd4f83 fixed an error in global.js 2020-12-12 07:15:24 +00:00
Anuken
e6c4a6cf69 Fixed #3932 2020-12-11 23:52:43 -05:00
Anuken
7c80af85e3 Property cleanup 2020-12-11 19:28:03 -05:00