mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 11:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,134 Commits 4 Branches 160 Tags 2.3 GiB
b495308832
Commit Graph

15134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Epowerj
1fa34518d6 Progress on marsh 2022-08-04 19:02:11 -04:00
Anuken
62d0d62d22 Fixed squished pump liquid icon 2022-08-04 18:45:51 -04:00
Epowerj
1245ff006f Progress on marsh 2022-08-04 18:45:26 -04:00
Anuken
f9c73c2fdc Merge remote-tracking branch 'origin/master' 2022-08-04 18:43:42 -04:00
Anuken
bf926d139d Fixed akrycite output 2022-08-04 18:43:38 -04:00
Epowerj
f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2022-08-04 14:55:14 -04:00
Nautilus
9561ac59ea
Update servers_v7.json (#7291) 
new ip address for Phoenix servers
 2022-08-04 14:39:36 -04:00
Epowerj
e3566bda28 Progress on marsh 2022-08-04 14:32:05 -04:00
Nunting
a13c8f5c4a
Update bundle_ko.properties (#7285) 2022-08-04 14:06:47 -04:00
Epowerj
d9312bc960 Progress on marsh 2022-08-04 13:51:41 -04:00
Anuken
12b255d443 Merge remote-tracking branch 'origin/master' 2022-08-04 13:49:26 -04:00
Anuken
1bb45fe91c Minor bugfixes/cleanup 2022-08-04 13:49:22 -04:00
GaviTSRA
9fc8b09d03
Update servers_v6.json (#7289) 2022-08-04 13:36:03 -04:00
rodas80
4ab5d0ba50
Update servers_v7.json (#7287) 2022-08-04 11:49:31 -04:00
Nautilus
e689fc4621
Update servers_be.json (#7286) 
Adding Phoenix-Network main server, pvp will follow later
 2022-08-04 11:11:10 -04:00
Anuken
46f8838d1a Fixed #7284 2022-08-04 10:23:49 -04:00
Anuken
1d8166669b Fixed #7283 2022-08-04 10:14:13 -04:00
Anuken
db8e7675c8 Merge remote-tracking branch 'origin/master' 2022-08-03 23:44:10 -04:00
Anuken
243a672a5b Disabled NetworkIO entity writing 2022-08-03 23:44:07 -04:00
Epowerj
d6a0ce0fce Progress on marsh 2022-08-03 21:09:37 -04:00
Aren Elchinyn
fe8e26bb95
Update servers_v7.json (#7252) 2022-08-03 19:37:02 -04:00
Nunting
45f8712fe8
Update bundle_ko.properties (#7262) 2022-08-03 19:36:06 -04:00
rodas80
011310b3db
Update servers_v7.json (#7273) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-03 19:35:50 -04:00
MEEPofFaith
ff28daa3a4
FlakDelay (#7281) 2022-08-03 17:08:53 -04:00
Epowerj
8a51ac0bdc More work on marsh 2022-08-03 16:33:21 -04:00
Epowerj
00d6a73c27 Tweaked tech tree and for marsh 2022-08-03 16:33:14 -04:00
Anuken
3138f05cc2 Merge remote-tracking branch 'origin/master' 2022-08-03 16:09:10 -04:00
Anuken
58246747ee Fixed shielded wall being available on Serpulo 2022-08-03 16:09:05 -04:00
SoMall-dumpling
c8257871b9
Update bundle_zh_CN.properties (#7261) 
* Update bundle_zh_CN.properties

The Ultimate Unit Control System Translation

* Update bundle_zh_CN.properties

The Ultimate Flux Reactor

* Update bundle_zh_CN.properties

删除一个多余的空行

* Update bundle_zh_CN.properties

语序调整
 2022-08-03 08:32:20 -04:00
Anuken
8a19582377 Merge remote-tracking branch 'origin/master' 2022-08-03 08:29:52 -04:00
Anuken
6f23fdf195 Fixed #7277 2022-08-03 08:29:47 -04:00
Github Actions
65db43268c Automatic bundle update 2022-08-03 01:27:29 +00:00
Anuken
b7948852b3 Merge remote-tracking branch 'origin/master' 2022-08-02 21:26:19 -04:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
xem8k5
28a280cd38
Update servers_v7.json (#7269) 2022-08-02 20:18:51 -04:00
Epowerj
e2dea0f84e Begin rework of basin 2022-08-02 18:32:26 -04:00
Epowerj
d77afbea06 Being work on marsh 2022-08-02 18:17:53 -04:00
Anuken
859baec744 Merge remote-tracking branch 'origin/master' 2022-08-02 13:13:42 -04:00
Anuken
e28d7b8d8d Generator explosion system cleanup 2022-08-02 13:13:37 -04:00
Phinner
a4c9d3043d
update (#7270) 2022-08-02 08:11:05 -04:00
Anuken
fa1a5971cf Merge remote-tracking branch 'origin/master' 2022-08-01 20:56:41 -04:00
Anuken
9a95754007 Fixed incorrect scaling with command layout 2022-08-01 20:56:37 -04:00
Github Actions
efb258e9a6 Automatic bundle update 2022-08-02 00:29:14 +00:00
Anuken
d301f6ebe3 Merge remote-tracking branch 'origin/master' 2022-08-01 20:28:12 -04:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
rodas80
fc6dcf96dc
Update servers_v7.json (#7266) 2022-07-31 14:00:19 -04:00
Anuken
df7a0f46b1 Merge remote-tracking branch 'origin/master' 2022-07-31 13:59:36 -04:00
Anuken
36ecb45fb4 Minor UI style tweaks 2022-07-31 13:59:31 -04:00
rodas80
68363b112b
Update servers_v6.json (#7265) 2022-07-31 13:44:49 -04:00
Anuken
3d0a1868c6 Merge remote-tracking branch 'origin/master' 2022-07-31 11:43:26 -04:00