mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,110 Commits 4 Branches 160 Tags 2.3 GiB
77b3a83826
Commit Graph

13110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
77b3a83826 WIP animated gas 2021-11-26 21:35:58 -05:00
Anuken
616fa8748f DrawRegion spinSprite 2021-11-25 18:54:35 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -05:00
Anuken
57e0f5ba3f Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2021-11-25 13:29:19 -05:00
Anuken
d6fa71ba92 Scuttler disabled for now 2021-11-25 13:29:14 -05:00
Anuken
3e1954f9de Scuttler disabled for now 2021-11-25 13:29:02 -05:00
Anuken
6c7dbdc91e Generative outlines for mod parts 2021-11-25 13:08:10 -05:00
Anuken
9b291a366a Fixed cyanogen color / Fixed liquid display negative values 2021-11-25 12:31:53 -05:00
Catchears
c24c5c6196
update german translation (#6354) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-11-25 12:09:16 -05:00
KuhnChris
cd0fbb4d81
(german translation) add missing liquid-container (#6353) 
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
 2021-11-25 12:07:50 -05:00
Anuken
d4ccbaa6df Merge remote-tracking branch 'origin/master' 2021-11-25 11:33:50 -05:00
Anuken
07696c7f92 Closes #6327 2021-11-25 11:33:44 -05:00
MrDuck557
ccfd062c85
ParticleEffect Rotation (#6323) 
* Additive

* ternary

* copypasta

I missed a total of 4 instances

* anuke has spoken

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-25 11:24:34 -05:00
Anuken
0743243ead Merge remote-tracking branch 'origin/master' 2021-11-25 11:09:18 -05:00
Anuken
4c36abde28 Fixed payEnter creating ghost units 2021-11-25 11:09:13 -05:00
L0615T1C5-216AC-9437
1896a7f024
update CN's available ports for v6 (#6368) 
bring back pvp and sandbox to CN!
 2021-11-24 22:04:16 -05:00
Anuken
1bcd48aadc ContinuousTurret ammo display 2021-11-24 19:23:08 -05:00
Anuken
78590abfc0 reinforced vault/container 2021-11-24 18:28:50 -05:00
Anuken
b7ac1e1d74 Stuff. 2021-11-24 13:33:01 -05:00
Anuken
3512190373 sublimate progress 2021-11-24 12:50:43 -05:00
Anuken
211c0b2e71 Sublimate visuals, damage/length still broken 2021-11-24 12:30:01 -05:00
Rex
010f07ed9f
Update servers_v6.json (#6365) 
new IPs & server
 2021-11-24 09:44:48 -05:00
Anuken
ba14151a01 A significant waste of time and effort 2021-11-23 22:41:25 -05:00
Anuken
54f04d8d2c
Closes #6363 2021-11-23 07:53:23 -05:00
Anuken
4d49b0b2ee Visual tweaks 2021-11-22 23:02:35 -05:00
Anuken
3a9fdc8b3d Phase synthesizer implementation 2021-11-22 22:34:22 -05:00
Anuken
d7adacd932 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-22 15:37:16 -05:00
Anuken
41e82881f3 Gradle 7.3 2021-11-22 15:32:00 -05:00
Anuken
947864269b Slag-based incinerator 2021-11-22 14:48:26 -05:00
Anuken
d218480f6f Turret requirement cleanup / WIP ContinuousTurret type 2021-11-22 13:59:09 -05:00
Anuken
f7cf35369b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 13:17:36 -05:00
Anuken
55219ea141 Merge remote-tracking branch 'origin/master' 2021-11-22 13:16:05 -05:00
Anuken
b0c46d3c97 Removed BindingsGenerator, FontGenerator 2021-11-22 13:16:00 -05:00
Anuken
fa2efcbe15
Update push.yml 2021-11-22 13:12:14 -05:00
Build Uploader
42d931bff4 Automatic bundle update 2021-11-22 18:10:50 +00:00
Darkness#3729
4eb4c84b64
[RU] Update bundle (#6355) 
**Ban**dle
 2021-11-22 13:09:35 -05:00
Anuken
a0ba464de1 Fixed ja/zh unicode nonsense 2021-11-22 12:13:14 -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
cec39f8a70 Merge remote-tracking branch 'origin/master' 2021-11-22 12:08:14 -05:00
Anuken
64b4478bac Better bundle updater output 2021-11-22 12:08:10 -05:00
rodas80
8c9de7e4eb
Update servers_v6.json (#6352) 2021-11-22 12:06:05 -05:00
Anuken
2d5e9118a5 I do not know bash 2021-11-22 12:04:51 -05:00
Anuken
261ad5dae5 BundleLauncher moved to gradle script 2021-11-22 12:04:09 -05:00
Anuken
e0b14db778 Added bundle updates as part of commit 2021-11-22 11:52:08 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
d550ad5614 no 2021-11-22 11:44:28 -05:00
Anuken
8717fd8b33 Better bundle updater implementation 2021-11-22 11:43:13 -05:00
Anuken
ef1084302f Merge remote-tracking branch 'origin/master' 2021-11-22 10:31:10 -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