mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity
12831 commits 4 branches 175 tags 2.4 GiB
Commit graph

12831 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew (or Maya) Peng
8cb830ba41
Make MoveLightningAbility alternating a boolean (#6390) 
* Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)"

This reverts commit e1685ef46c.

* boolean `alternate`

* Better Javadoc description
 2021-11-29 23:05:35 -05:00
Matthew (or Maya) Peng
3819e327e9
Grammar (#6383) 
* Grammar

* English is a terrible language
 2021-11-29 21:15:15 -05:00
Anuken
51fe07daef Backported EnumSet changes 2021-11-29 20:15:13 -05:00
Anuken
dc0904a6c7 Merge remote-tracking branch 'origin/master' 2021-11-29 20:14:05 -05:00
Anuken
feba9d677e Fixed #6389 2021-11-29 20:13:59 -05:00
smol
582f05fa33
Fix a single pixel in Fuse's sprite (#6387) 
* Create m

* Delete m

* Add files via upload
 2021-11-29 12:23:16 -05:00
Darkness#3729
061357e1df
Reserved 5000 port for a new gamemode (#6385) 
👀
 2021-11-29 09:46:45 -05:00
buthed010203
c055407249
Fix editor camera panning (#6380) 
VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time.
 2021-11-26 13:45:27 -05:00
Matthew (or Maya) Peng
e1685ef46c
BlueWolf does not want MoveLightningAbility to mirror (#6376) 2021-11-26 11:05:50 -05:00
Anuken
22564de3c8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-11-25 18:54:49 -05:00
Anuken
ce065f0324 arc 2021-11-25 18:54:46 -05:00
router
4eca2b4b0b
Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -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
Rex
010f07ed9f
Update servers_v6.json (#6365) 
new IPs & server
 2021-11-24 09:44:48 -05:00
Anuken
54f04d8d2c
Closes #6363 2021-11-23 07:53:23 -05:00
Anuken
41e82881f3 Gradle 7.3 2021-11-22 15:32:00 -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
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
MrDuck557
25f98fdeb0
engineColor (#6360) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:11:03 -05:00
MrDuck557
f1e9d05163
blinkSize (#6359) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:08:57 -05:00
Valeriy
f81d519c91
Add to v7 (#6357) 2021-11-21 10:38:06 -05:00
Valeriy
5a03083b57
Removing from v6 (#6356) 2021-11-21 10:37:58 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00