Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,540 Commits 4 Branches 180 Tags
ebaf88e80d7fcf680129789a90d0311854061f4b
Commit Graph
18540 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MEEPofFaith a3a7598e6d Un-lonely the liquid display 2024-03-25 10:48:21 -07:00
MEEPofFaithandGitHub 4cacb79ccd Auto-add produce to liquids (#9666) 2024-03-25 13:31:03 -04:00
PolarStarandGitHub e97dc7a960 Update servers_v7.json (#9671) 
Merging servers
 2024-03-24 15:03:08 -04:00
Anuken 8fe0826892 Better base core randomization 2024-03-22 15:14:52 -04:00
Anuken 32ae555ad6 Fixed power links in editor sector generate 2024-03-22 15:02:59 -04:00
Anuken 61fb60013f Merge remote-tracking branch 'origin/master' 2024-03-21 10:32:51 -04:00
Anuken 2539bb0195 Fixed #9663 2024-03-21 10:32:43 -04:00
HubsvVNandGitHub 714eca07d0 Update servers_v7.json (#9661) 2024-03-20 20:42:45 -04:00
TheRadioactiveBananaandGitHub 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
abcxyzDustryandGitHub 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
CragentandGitHub 0c10a3e056 Update servers_v7.json (#9653) 
update a name
 2024-03-18 09:30:30 -04:00
jp-x-gandGitHub 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
00Bread00andGitHub 789264f3b6 Update servers_v7.json (#9646) 
add toast servers
 2024-03-16 10:49:13 -04:00
meiqiuandGitHub a1e5566fe0 Update servers_v7.json (#9636) 2024-03-16 00:17:49 -04:00
112HackandGitHub 6aa744bc57 Update servers_v7.json (#9639) 2024-03-16 00:17:41 -04:00
TheRadioactiveBananaandGitHub 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
ElixiasandGitHub 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
MEEPofFaithandGitHub 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
GlFolkerandGitHub 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
Mythril382andGitHub 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
JasonGitHubphinner
 		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
c6b2qb5gandGitHub 4366f904ee Update servers_v7.json (#9626) 2024-03-09 18:01:32 -05:00