mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
11,130 Commits 4 Branches 160 Tags 2.3 GiB
158e23bd5e
Commit Graph

11130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xasmedy
1c0d148607
Removed same if statement. (#4607) 
Removed an if statement that was the same of the one up.
 2021-02-06 18:13:48 -05:00
Anuken
95c8b7ae60 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-02-06 12:06:03 -05:00
Anuken
25d013b768 Mod browser icon support 2021-02-06 12:05:59 -05:00
Patrick 'Quezler' Mounier
9de8c4d8ac
Update servers_be.json (#4602) 2021-02-06 09:09:56 -05:00
Anuken
7e4ffe6a7d Fixed builds failing without Android project 2021-02-06 08:43:15 -05:00
Anuken
b90372a226 Testing bloom on iOS 2021-02-06 08:37:02 -05:00
Anuken
9adbfcac0f Re-added jcenter repo 2021-02-05 14:11:52 -05:00
Anuken
d1eb7743ad Better mod browser horizontal layout 2021-02-05 12:12:08 -05:00
Anuken
fc3352bcb1 Java mod import support / Moved mod browser button 2021-02-05 11:21:27 -05:00
Anuken
9b3360d932 Mod content lists 2021-02-04 21:02:57 -05:00
Anuken
3784bfac77 Allow mod re-import / Save mod repo on import 2021-02-04 19:30:52 -05:00
Anuken
54754cd177 Don't reset processors when links change 2021-02-04 18:19:56 -05:00
Anuken
c48034e420 Merge remote-tracking branch 'origin/master' 2021-02-04 14:12:07 -05:00
Anuken
3299279c89 Removed jcenter repositories 2021-02-04 14:12:03 -05:00
Patrick 'Quezler' Mounier
a6c3ebc467
Save rotation of repair points (#4586) 2021-02-04 10:23:17 -05:00
Anuken
9f510f61c7 Fixed #4584 2021-02-04 09:25:52 -05:00
Anuken
3ae48b8753 Merge remote-tracking branch 'origin/master' 2021-02-03 19:17:14 -05:00
Anuken
f41725b8dc Minimap unit rendering fix 2021-02-03 19:17:07 -05:00
Fatonndev
115df3aedd
Add obvilionnetwork.ru Recapture and Attack servers (#4582) 
* Add obvilionnetwork.ru Recapture and Attack servers

* Update servers_v6.json

* Update servers_v6.json
 2021-02-03 17:04:55 -05:00
buthed010203
3c136ad0ba
add transportation group to container and vault (#4499) 
this allows for them to be placed over belts so that people no longer have to clear an area around the core when placing vaults around it.
 2021-02-02 15:32:52 -05:00
Patrick 'Quezler' Mounier
48ee3d255d
Make timescale accessible to logic (#4503) 2021-02-02 15:20:36 -05:00
QmelZ
b05f867800
add rotation to ParticleEffect (#4501) 
* add rotation to ParticleEffect

* add offset
 2021-02-02 13:14:47 -05:00
Anuken
55b790a0d4 Merge remote-tracking branch 'origin/master' 2021-02-02 13:13:45 -05:00
Anuken
57f6c9dfd9 Mech rebalancing 2021-02-02 13:13:38 -05:00
Nikopol
2f9c95afd0
Moving server to C.A.M.S. (#4497) 
NikoCHIO now in C.A.M.S.
 2021-02-02 09:22:54 -05:00
彭瑞暄
4fe1457d96
Updated zh-TW translations (#4449) 
* Update bundle_zh_TW.properties

mod sorting & charge

* Changed "Charge"

A better translation came to mind
 2021-02-01 09:29:03 -05:00
Folker
2589a27cb5
Create FileTreeInitEvent (#4489) 
* filetree init event

* actions do your thing
 2021-02-01 09:27:24 -05:00
Anuken
8704e14fd7 Fixed #4493 / Fixed #4492 / Fixed #4490 2021-02-01 09:24:39 -05:00
Anuken
2b17dbe390 #4487 but properly implemented 2021-01-31 19:44:29 -05:00
Anuken
919012608a Merge remote-tracking branch 'origin/master' 2021-01-31 16:35:17 -05:00
Anuken
5675a5b035 F 2021-01-31 16:35:13 -05:00
RebornTrack970
6724752980
Added server Omega (#4435) 
* Added server Omega

This is the hub of my servers. The other ip for it is: omega.my.to:25906 but that one sometimes doesnt work.

* changed the ip to dns version

* the ip seems more useable

some devices cant seem to connet to dns.

Co-authored-by: Anuken <arnukren@gmail.com>
 2021-01-31 15:58:26 -05:00
UnCaughT
0e078a9c60
Update servers_v6.json (#4452) 
Русскоязычный сервер с Hex сражениями.
 2021-01-31 15:57:08 -05:00
_owler_#0954
c0b1dfc55a
closed. (#4481) 2021-01-31 15:52:55 -05:00
Anuken
3d201f7042 Fixed #4474 / Fixed #4475 / Fixed #4476 / Fixed #4483 2021-01-31 15:51:42 -05:00
Anuken
f1a5aae30a Merge remote-tracking branch 'origin/master' 2021-01-29 12:02:36 -05:00
Anuken
9142da2b70 Stop shooting upon crawler death 2021-01-29 12:02:31 -05:00
Vajda Simon
022c76bf45
bundle_hu.properties (#4464) 
They spoke on Discord because of an incorrect translation.
 2021-01-29 09:40:07 -05:00
Patrick 'Quezler' Mounier
bc6db72df0
Make fillitems fill the core to the brim (#4462) 
Instead of just setting all items to the capacity of the first found core.
 2021-01-29 09:38:26 -05:00
Anuken
d512aa5b21 Fixed #4463 2021-01-29 09:32:29 -05:00
Anuken
7cdf7a21fe Minor power graph optimizations 2021-01-28 12:07:50 -05:00
Anuken
9a5a6e1ce2 Merge remote-tracking branch 'origin/master' 2021-01-28 10:23:07 -05:00
Anuken
5a258d2830 Fixed #4461 2021-01-28 10:23:02 -05:00
Patrick 'Quezler' Mounier
96ee32f8ed
Custom Game Underline 2: Electric Boogaloo (#4457) 
* Update CustomGameDialog.java

* Remove .row() for consistensy
 2021-01-28 09:06:30 -05:00
Joshua Fan
a667a94c8e
Draw plastanium conveyors on conveyors layer (#4446) 2021-01-27 12:08:51 -05:00
Anuken
d0572a2a0d Merge remote-tracking branch 'origin/master' 2021-01-27 11:49:08 -05:00
Anuken
47eea79b60 Fixed #4453 / Fixed #4450 2021-01-27 11:49:04 -05:00
Patrick 'Quezler' Mounier
03b37235b3
producer -> generator (#4441) 2021-01-26 11:35:48 -05:00
Patrick 'Quezler' Mounier
6969fbb1e7
Give tsunami the extinguisher flag as well (#4442) 2021-01-26 11:31:36 -05:00
Anuken
ccc59aa61b Minor wave task tweaks 2021-01-26 10:37:36 -05:00