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

12867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew (or Maya) Peng
1d14fa78bf Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Volas171
02db63aa91 update omega ips (#6482) 2022-01-10 18:13:07 -05:00
OSP
4eab4ab569 [XCore] update ip (#6481) 2022-01-09 17:00:46 -05:00
Yuri Polyakov
12a8797019 Add server to global (#6479) 
* Add server to global

* Ня
 2022-01-09 11:37:48 -05:00
KotMilkMeoW
030d66fb73 MeowLand cumeback (#6478) 
👀
 2022-01-09 10:06:35 -05:00
Matthew (or Maya) Peng
9825d2f746 Incorrect reset (#6477) 2022-01-08 21:34:12 -05:00
Valeriy
f8af593177 SMoA will come back (#6475) 
Domen isnt active yet
 2022-01-08 11:47:29 -05:00
Nile
16d7a368c6 added crawler hell (#6469) 2022-01-06 18:59:41 -05:00
TranquillyUnpleasant
3701ac131e More info (#6465) 
* change wave timer to display serverside when waves exist

* show total and enemy units, not just enemy units

* format
 2022-01-02 00:22:19 -05:00
RebornTrack970
ec00f59b82 Infection port change (#6457) 2021-12-30 09:36:55 -05:00
Nile
2da4408dd1 Added Infection (#6455) 
fun gamemode
 2021-12-29 09:30:27 -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
Phinner
84d87e7e9f Allow Custom input handling in servers (#6452) 
* enable input redirection

* oops
 2021-12-23 23:30:46 -05:00
buthed010203
0036efba0c Properly update map name and gamemode on steam (#6449) 
* Properly update map name and gamemode on steam

This has been bugging me for the longest time but I've been too lazy to fix it, I finally got around to doing so.

* fix
 2021-12-22 14:23:24 -05:00
buthed010203
34c4aa07de Fix assertion message (#6448) 
It previously said `exotic-mod must be loaded. ==> expected: <betamindy> but was: <exotic-mod>` when it failed which makes absolutely no sense.
 2021-12-21 12:09:51 -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
Valeriy
24d3054bac End of this nightmare (#6444) 
SMoA/Skaarj was end of existing
 2021-12-18 08:35:58 -05:00
L0615T1C5-216AC-9437
7880135824 Allow setting to be reset through the use of config key default (#6442) 2021-12-17 17:13:49 -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
RebornTrack970
6c26edbd84 Fixed Omega Servers on V7 (#6432) 
* Fixed Omega Servers

* Update servers_v7.json
 2021-12-13 11:18:53 -05:00
Prosta4okua
192588d373 Update LanguageDialog.java (#6431) 2021-12-12 18:15:26 -05:00
RebornTrack970
a3100980dc Fixed 2R2T (#6426) 2021-12-11 09:26:38 -05:00
Volas171
f4c7637071 Update Omega v7 and v6 ips (serverlist) (#6420) 
* update omega ip

* omega v7 ip change

* i forgo 💀
 2021-12-09 09:49:11 -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
Rex
76af0228c1 Update servers_v6.json (#6407) 
* Update servers_v6.json

* Update servers_v6.json
 2021-12-05 16:00:37 -05:00
Alexander397172YT
a3385df88b new createdustry IP (#6406) 2021-12-05 12:39:02 -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
alex
adb03c465b add v7 servers for alex servers (#6393) 
* Update v6 servers for alex servers

* Update servers_v7.json

alex v7 server
 2021-12-02 19:24:44 -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
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>
v135 		2021-11-25 12:09:16 -05:00