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
14,813 Commits 4 Branches 160 Tags 2.3 GiB
494440a591
Commit Graph

217 Commits

Author SHA1 Message Date
Github Actions
2e7dca06ed Automatic bundle update 2022-07-15 23:27:34 +00:00
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Github Actions
5ea8538e0f Automatic bundle update 2022-07-07 01:29:48 +00:00
Github Actions
5e45b64ee1 Automatic bundle update 2022-07-06 17:00:37 +00:00
Github Actions
85321d7465 Automatic bundle update 2022-07-05 22:42:07 +00:00
Github Actions
97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00:00
Github Actions
261714d395 Automatic bundle update 2022-06-30 03:04:25 +00:00
Github Actions
82b3bd7520 Automatic bundle update 2022-06-29 22:51:22 +00:00
Github Actions
8f0b8c1277 Automatic bundle update 2022-06-27 13:57:57 +00:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Github Actions
2f45ec7c90 Automatic bundle update 2022-06-20 23:37:58 +00:00
Github Actions
3137ec09e3 Automatic bundle update 2022-06-19 14:58:55 +00:00
Github Actions
58e274b29f Automatic bundle update 2022-06-17 22:20:30 +00:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Github Actions
91643d94c4 Automatic bundle update 2022-06-08 12:58:35 +00:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Github Actions
e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00:00
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
Anuken
e4595b6831 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
 2022-01-27 14:58:44 -05:00
VizardAlpha
3311e40906
Update bundle_fr.properties (#6373) 
* Update bundle_fr.properties

* Removes -> Destroys..
 2022-01-17 23:18:41 -05:00
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
VizardAlpha
99e7fcd2d2
Update bundle_fr.properties (#6241) 
* Update bundle_fr.properties

After checking, there was some text missing to be translated.

* Minor modification
 2021-11-01 09:31:25 -04:00
VizardAlpha
7c1d4a092e
Update bundle_fr.properties (#6227) 2021-10-27 11:25:37 -04:00
VizardAlpha
fc9abeb908
Update bundle_fr.properties (#6172) 
* Update bundle_fr.properties

More branch merging.. Commits and more..

* Added logic variable display window
 2021-10-17 15:23:59 -04:00
VizardAlpha
f2139fad6e
Update bundle_fr.properties (#6035) 
* Update bundle_fr.properties

* Adding new commits

* Don't suggest changing the mod disable option

* ....
 2021-10-05 22:18:06 -04:00
VizardAlpha
ee8b4f478d
Updates bundle_fr.properties (#5931) 
* Updates bundle_fr.properties

* Added rivers on Serpulo / Added deep tainted water

* Error correction

* More campaign map progress .. Added new commits

* Update bundle_fr.properties
 2021-09-12 11:09:46 -04:00
VizardAlpha
4f22db8db5
Updates bundle_fr.properties (#5663) 
* Updates bundle_fr.properties

Final core launch animation / Added option to skip core animations

* Translation end

* Proper name/impl for "borderless windowed" on Windows

* Mod import progress bar

* WIP team icons

* Improved environmental block internal names

* Update core/assets/bundles/bundle_fr.properties

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>

* payload source and void descriptions

* Game stats cleanup

* Added max units field for wave editor

* Added max units

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-08-23 16:58:31 -04:00