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

18533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HubsvVN
714eca07d0 Update servers_v7.json (#9661) 2024-03-20 20:42:45 -04:00
TheRadioactiveBanana
98b64bd096 ok uk finally works ig (#9660) 
Im not going to move the servers back *now*, probably near future though
 2024-03-20 20:15:06 -04:00
MEEPofFaith
92485bd4e6 Revert "Shift the item display over a column instead" 
This reverts commit e40dab9733.
 2024-03-19 18:45:59 -07:00
MEEPofFaith
e40dab9733 Shift the item display over a column instead 2024-03-19 18:37:03 -07:00
Anuken
476c79df4b Fixed #9657 2024-03-19 16:11:51 -04:00
Anuken
45b7e2a742 Fixed #9658 2024-03-19 16:09:24 -04:00
MEEPofFaith
c3823b8477 Cleaner liquid display + Display item rate 2024-03-19 12:22:32 -07:00
Anuken
522cd3ceec Merge remote-tracking branch 'origin/master' 2024-03-19 15:09:23 -04:00
Anuken
aea1897309 Fixed #9656 2024-03-19 15:09:16 -04:00
abcxyzDustry
aa5660521a Update servers_v7.json (#9655) 2024-03-19 14:27:17 -04:00
Anuken
fc036c2f06 Fixed a startup crash with certain mods 2024-03-19 09:27:55 -04:00
Anuken
0efa8be09d Merge remote-tracking branch 'origin/master' 2024-03-18 10:00:24 -04:00
Anuken
51888a6853 Don't crash with file chooser errors 2024-03-18 10:00:15 -04:00
Cragent
0c10a3e056 Update servers_v7.json (#9653) 
update a name
 2024-03-18 09:30:30 -04:00
jp-x-g
0a512e05c3 Make a "unitCommandPosition" event so that unit commands issued to non-attack coordinates can still be listened for (#9650) 
* Update InputHandler.java

Make commandTap fire a Trigger.unitCommandPosition (in the event that it doesn't fire a Trigger.unitCommandAttack)

* Update EventType.java

Add "unitCommandPosition" to Trigger, for when selected units are commanded to move to a position (without that position being an attack).
 2024-03-18 09:30:18 -04:00
Anuken
3162f043d2 Possible weapon autotarget fire fix 2024-03-17 12:24:11 -04:00
Anuken
94f08fe067 Merge remote-tracking branch 'origin/master' 2024-03-17 01:25:09 -04:00
Anuken
553d3fc351 cool fix 2024-03-17 01:25:03 -04:00
MEEPofFaith
66893e5c85 Text Style 2024-03-16 15:25:13 -07:00
MEEPofFaith
11dcbe19f4 Better LiquidDisplay 2024-03-16 15:18:58 -07:00
MEEPofFaith
a1b3f54516 Add liquid consumption rates 2024-03-16 15:04:27 -07:00
MEEPofFaith
e1476abbfd Remove explosive danger notice 
Surprise!!!!
 2024-03-16 14:28:44 -07:00
MEEPofFaith
3021ac5d60 Merge branch 'master' into power-gen-stats 2024-03-16 14:26:32 -07:00
00Bread00
789264f3b6 Update servers_v7.json (#9646) 
add toast servers
 2024-03-16 10:49:13 -04:00
meiqiu
a1e5566fe0 Update servers_v7.json (#9636) 2024-03-16 00:17:49 -04:00
112Hack
6aa744bc57 Update servers_v7.json (#9639) 2024-03-16 00:17:41 -04:00
TheRadioactiveBanana
9a43a708af Moving more ports from UK to EU (#9644) 2024-03-16 00:17:17 -04:00
Anuken
97f72b8c6b Merge remote-tracking branch 'origin/master' 2024-03-15 14:14:59 -04:00
Anuken
5365014d4f Sector preset init fix 2024-03-15 14:14:53 -04:00
MEEPofFaith
24b845e8b1 Notice of explosiveness 
I feel like my changes are getting a *bit* intrusive.
 2024-03-15 09:25:10 -07:00
MEEPofFaith
e96e312693 Merge branch 'master' into power-gen-stats 2024-03-15 08:36:13 -07:00
Elixias
0311cfd275 Full icon overrides (#9642) 
* Something to help with atlas consumption

* nightmares
 2024-03-15 11:08:23 -04:00
Anuken
7be19b3baa Merge remote-tracking branch 'origin/master' 2024-03-14 18:53:35 -04:00
Anuken
40d06c87d1 Mark disabled dependencies #9641 2024-03-14 18:53:28 -04:00
Github Actions
824c6eedb3 Automatic bundle update 2024-03-14 18:25:49 +00:00
MEEPofFaith
60c6e03d32 Weather with World Logic (#9621) 
* Weather sense

Honestly, doesn't seem game changing enough to warrant privileged restriction.

* Weather set

* Rename "snow" to "snowing"

Fix conflict with the snow floor block, though I don't know if this'll have negative repercussions on saves.

* Don't last forever

* Cleanup and bundle

* add space
 2024-03-14 14:25:03 -04:00
GlFolker
3f46080f42 Allow categorized sprite names to not be prefixed. (#9616) 
* Delegate more methods into Planet

* Allow categorized sprite prefixes
 2024-03-14 12:12:28 -04:00
Mythril382
11f9052715 Merge branch 'Anuken:master' into do-you-hear-the-voices-too 2024-03-11 17:25:34 +08:00
MEEPofFaith
afddb274f6 Don't display locked or hidden items 2024-03-10 13:06:56 -07:00
MEEPofFaith
8e0d3fee67 Allow for simultaneously having both item and liquid efficiency multipliers 2024-03-10 13:01:52 -07:00
MEEPofFaith
3e68285940 Better display for efficiency multiplier consumes 2024-03-10 12:59:00 -07:00
Jason
332d3af893 Update servers_v7.json (#9631) 
* Update servers_v7.json

Fix owner forgetting to renew c-n.ddns.net

* Add missing pvp and events ip

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* chore: Correct server adresses

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
Co-authored-by: phinner <62483793+phinner@users.noreply.github.com>
 2024-03-10 09:51:15 -04:00
c6b2qb5g
4366f904ee Update servers_v7.json (#9626) 2024-03-09 18:01:32 -05:00
liangliangsan
df147bbc55 Update servers_v7.json (#9629) 
* Update servers_v7.json

* Update servers_v7.json
 2024-03-09 17:57:52 -05:00
Joan Josep
94de7ee991 Update bundle_ca.properties (#9630) 2024-03-09 17:56:58 -05:00
summoner001
b49b1b28f1 Update bundle_hu.properties (#9614) 
* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian tranlation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing anf polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishging the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hunagrian tranlation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation
 2024-03-09 11:05:25 -05:00
Anuken
f10fa60428 Merge remote-tracking branch 'origin/master' 2024-03-08 21:04:41 -05:00
Anuken
d7dc180a3f Fixed #9628 2024-03-08 21:04:35 -05:00
GeoNew2011
844c6c021a Update servers_v7.json (#9627) 2024-03-08 13:14:35 -05:00
Github Actions
6a7a417107 Automatic bundle update 2024-03-07 15:09:27 +00:00