Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,867 Commits 4 Branches 180 Tags
1d14fa78bf9ebc1f33d895cebd870795599c1728
Commit Graph

10719 Commits

Author SHA1 Message Date
Matthew (or Maya) Peng
1d14fa78bf Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Matthew (or Maya) Peng
9825d2f746 Incorrect reset (#6477) 2022-01-08 21:34:12 -05:00
buthed010203
692718d4ea Fix strange behavior of MinerAI (#6454) 
* Fix strange behavior of MinerAI 

See: https://discord.com/channels/391020510269669376/396416151032299521/925110542216073216

> Anuke, is the current behavior of miner ai where it wont mine anything if the item that the core has the fewest of has all of its ores covered?
The only place the hasOre code is used is miner ai so i assume thats a bug?

* Update BlockIndexer.java
 2021-12-28 23:22:01 -05:00
Anuken
2dfa238ff3 More debug stats 2021-12-21 10:33:09 -05:00
Anuken
a093ba5511 Merge remote-tracking branch 'origin/master' 2021-12-21 10:25:54 -05:00
Anuken
24420c4371 Added temporary client debug status methods 2021-12-21 10:25:47 -05:00
KuhnChris
4b6541ae4e Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) 
* Update settings file (bundle_de)

* Update bundle_de.properties
 2021-12-14 12:52:26 -05:00
Matthew (or Maya) Peng
339d87ad78 Check the status, not the bullet (#6434) 2021-12-13 21:44:54 -05:00
Matthew (or Maya) Peng
052b47fbe4 remove space from perSecond and perMinute (#6435) 2021-12-13 21:44:10 -05:00
Fancy2209
b5c1972040 Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) 
* Update bundle_pt_PT.properties

* Fix the other 2 words with -/ I didn't notice
 2021-12-13 13:20:30 -05:00
Prosta4okua
192588d373 Update LanguageDialog.java (#6431) 2021-12-12 18:15:26 -05:00
Darkness#3729
3a91460e24 Fix (#6414) 2021-12-08 10:01:02 -05:00
Matthew (or Maya) Peng
b70c08c2ec Removes -> Destroys (#6409) 
* Removes -> Destroys

* inputed

* bad language design TM

english sucks
 2021-12-08 00:03:11 -05:00
Matthew (or Maya) Peng
8e89b24e5b unprivate countOre (#6410) 2021-12-08 00:02:52 -05:00
buthed010203
5c3ecaabb5 Fix incorrect return value (#6401) 
* Fix incorrect return value

the javadoc is a lie

* Update Administration.java
 2021-12-04 20:41:29 -05:00
Matthew (or Maya) Peng
5ea4688e88 get by name (#6396) 2021-12-02 15:43:31 -05:00
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
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
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
4c36abde28 Fixed payEnter creating ghost units 2021-11-25 11:09:13 -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
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -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
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
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
hortiSquash
fd1678dbc9 Unloading into plast belts - bug fix (#6347) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

* unloader - fix cant load

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-17 09:35:36 -05:00
Matthew Peng
4a7774fe5a Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken
d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00