mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 00:49:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,161 Commits 4 Branches 160 Tags 2.3 GiB
920cedb334
Commit Graph

15161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
ecdedf383a Merge remote-tracking branch 'origin/master' 2022-08-06 13:38:35 -04:00
Anuken
32f3190762 Less stacking in objectives dialog 2022-08-06 13:38:31 -04:00
Lucky Clover
e4255755ec
liquidTank should be consistant as well (#7311) 2022-08-06 13:32:13 -04:00
Anuken
0c4d9d89bf
Update bug_report.md 2022-08-06 13:31:45 -04:00
Anuken
9d1c03ccd9 Merge remote-tracking branch 'origin/master' 2022-08-06 13:30:52 -04:00
Anuken
45e5ab8ecc Fixed #7310 2022-08-06 13:30:47 -04:00
SoMall-dumpling
aa5ba1a3aa
Update FlakBulletType.java (#7313) 
fix erekir core unit make flak bullets explode
 2022-08-06 13:29:47 -04:00
Anuken
e9eb713a39 Fixed #7309 2022-08-06 00:12:34 -04:00
Epowerj
33ef30923b Progress on marsh 2022-08-05 19:13:51 -04:00
Epowerj
a127302aae Progress on marsh 2022-08-05 18:26:09 -04:00
Epowerj
605f727f22 Progress on marsh 2022-08-05 18:11:19 -04:00
Epowerj
b1ad070f80 Progress on marsh 2022-08-05 17:34:56 -04:00
Epowerj
dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Epowerj
4f652852ec Progress on marsh 2022-08-05 17:04:40 -04:00
Anuken
a833bb09fe Merge remote-tracking branch 'origin/master' 2022-08-05 16:27:28 -04:00
Anuken
36ce1ea2af Faster beryllium drilling with burst drills 2022-08-05 16:27:23 -04:00
Epowerj
aa7576758a Tweaks on basin 2022-08-05 15:52:16 -04:00
Joan Josep
275293e45c
Update bundle_ca.properties (#7301) 
* Update bundle_ca.properties

* Update bundle_ca.properties
 2022-08-05 15:09:05 -04:00
Github Actions
031ca650bd Automatic bundle update 2022-08-05 18:27:32 +00:00
Thomas Widyantoko
e3c4bd86db
[ID] id_ID bundle update (#7175) 
* [ID] various bundle update

+ Mod Browser release, some editor functions, sector four description, and more

* quick bundle update

sector, block, logic descriptions and other fixes
will continue again later my house is being renovated bruh

* finalizing v7 alpha id_ID translation

turrets are now translated, adjusted stats and status to match its function, and stuff

* added heat source to id_ID

...and other new things i guess

* adds new lines from EN bundle to id_ID

includes Neoplasia Reactor and other fixes

also things changed a lot behind the scenes
 2022-08-05 14:26:38 -04:00
rodas80
28aa47d088
Update servers_v7.json (#7304) 2022-08-05 14:25:52 -04:00
Anuken
6a5d7da4ae Fixed #7303 / Fixed #7302 2022-08-05 14:25:37 -04:00
Anuken
8b6d3a67f3 Fixed #7299 2022-08-05 09:39:45 -04:00
Anuken
0f831d598d Fixed #7296 2022-08-05 09:35:04 -04:00
Anuken
11d3b1d973 Fixed #7292 2022-08-04 20:20:46 -04:00
Epowerj
d882dcf395 Marsh is probably testable now once Anuke is done with ground beryllium rebalancing 2022-08-04 19:28:31 -04:00
Epowerj
f728bd643a Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-04 19:02:22 -04:00
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