Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,912 Commits 4 Branches 180 Tags
761b357e4612580fcc5def1cb94765890767f2b4
Commit Graph
12912 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hortiSquashandGitHub 761b357e46 Allows for different Pixels/Area (#6562) 
* Allows for different Pixels/Area

Spent the entire day asking people if they knew of any mod that change would break, the answer is negative

modders, if you want the screen to take the entire space, remove both the -4

* ScaleFactor so it doesnt break existing mods

scale = (size * 32 - bordersize / 2) / displaySize

* facepalm

* Update LogicDisplay.java

why am i dumb every time i do changes on the fly

* Update LogicDisplay.java
 2022-02-08 18:02:59 -05:00
Matthew (or Maya) PengandGitHub 6a053f2f45 Allow for same-size core upgrades (#6558) 2022-02-05 17:58:36 -05:00
Matthew (or Maya) PengandGitHub c877c3416e Reset after drawing bullet. (#6557) 2022-02-05 16:03:32 -05:00
Sunny KimandGitHub 126baa93d7 Save fires from color (#6556) 2022-02-05 11:14:43 -05:00
buthed010203andGitHub 7dce2ee9ec Do not the overlap. (#6555) 
I got sick of waiting for this to get patched in vanilla so I did it myself.
 2022-02-04 18:53:14 -05:00
Matthew (or Maya) PengandGitHub 16b9d68773 Option to not hardcode a bullet's status and despawnHit (#6553) 
* Make not being hardcoded an option

* No one is gonna set a negative light radius, but just in case...
 2022-02-03 09:48:44 -05:00
OSPandGitHub 4ee2ce3ba5 [XCore] Domain (#6554) 2022-02-03 09:48:34 -05:00
Anuken d7e55e83da arc 2022-02-02 23:38:07 -05:00
Anuken 335cd0c8a1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-02-02 23:38:04 -05:00
Anuken c01ad67614 arc 2022-02-02 23:38:00 -05:00
Sam BloomandGitHub 34d8ce59cb new yeet hosting servers (#6552) 2022-02-02 18:38:40 -05:00
TakeGitHubAnuken
 		5c4f3171f7 Japanese translation (#5858) 
* translate sector name

* fix sector description translation

* fix translate: status

* fix translate: remove WIP from setting.coreitems.name

* correct a notation error between "ターレット" and "タレット"

* translate: link.bug, 研究タブ, network error, sectors.stored

* transalte: block name, use "放電" instead of "電撃アーク", scepter description

* fix translate: unmoving

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-02-02 16:57:02 -05:00
Anuken ae924e6e2b Merge remote-tracking branch 'origin/master' 2022-02-02 11:54:44 -05:00
Anuken ca6723e696 Light RGB clamp + Arc update 2022-02-02 11:54:39 -05:00
Sam BloomandGitHub dc02678a6d Omega IP Change (#6548) 
* almost done

* Update servers_v6.json

* last ip change (for a long time)
 2022-02-01 17:35:58 -05:00
RecessiveandGitHub e5d16a73c5 Changed AA servers to new IP (#6546) 2022-02-01 09:35:59 -05:00
AnukenandGitHub 85d3680094 I have not checked my email in a month 
and at this point I'm not sure if I should.
 2022-01-31 14:46:18 -05:00
RexandGitHub b3a91f50c1 Update servers_v6.json (#6543) 2022-01-31 14:42:25 -05:00
smolandGitHub 29311806a9 PlayerConnectionConfirmed (#6539) 
* PlayerConnectionConfirmed

* AdminRequestEvent
 2022-01-29 11:34:34 -05:00
Leonid SkorospelovandGitHub 0b9483cffc Preserve conveyors end rotation on placement (#6496) 
* Preserve conveyors end rotation on placement

* Formatting
 2022-01-27 14:57:43 -05:00
buthed010203andGitHub fa06d2c20b Fix broken powernode Point2[] config (#6531) 
This was broken. I fixed it.
 2022-01-25 10:38:38 -05:00
Sh1p*nfireandGitHub d81efe4f71 fix Cyerce's frag keeping owner velocity (#6527) 2022-01-25 10:05:52 -05:00
PhinnerandGitHub ed598e203c Add Xpdustry BE server (#6526) 
A secret place for testing unstable plugins :^)
 2022-01-24 11:05:53 -05:00
SachaTendingandGitHub 5596354454 Add tendhost to servers (#6517) 
* Add tendhost to servers

New server

* Update servers_v6.json
 2022-01-24 11:03:38 -05:00
Matthew (or Maya) PengandGitHub 716702623d onConfigureClosed (#6523) 
* onConfigureClosed

* Run the closing of the previous block's config on the opening of another
 2022-01-23 19:34:28 -05:00
NileandGitHub e2658ba497 Restoring the natural order of things (#6514) 
Renamed Infection to Yeet Hosting, as Infection has dissolved due to recessive's return, and Yeet Hosting was our hosts when it was up.
 2022-01-21 20:07:37 -05:00
CPXMCandGitHub 30070ce759 Change my main name in Contributors (#6513) 
CPXMC to PCX-LK
 2022-01-21 20:05:48 -05:00
OSPandGitHub c26671fd4b [XCore] Attack ip update (#6512) 2022-01-21 16:28:11 -05:00
Даркнесс#3729andGitHub df994a2ebd Remove my second server and a V6 server (#6510) 
* Remove my second server and 2 cursed servers

Remove

* Add Community server back
 2022-01-21 14:50:32 -05:00
IloveideaandGitHub 287dc35640 Update LiquidConverter.java (#6507) 2022-01-21 09:46:03 -05:00
RebornTrack970andGitHub a3ccdce0eb Infection dns change (#6506) 2022-01-19 10:42:31 -05:00
WeathercoldandGitHub 4a05c9547a TextSetting (#6503) 
* tile

tile

* > Called right after load()

* TextSetting

* nvm I change the doc instead

* Fixes
 2022-01-18 22:26:24 -05:00
VizardAlphaandGitHub 3311e40906 Update bundle_fr.properties (#6373) 
* Update bundle_fr.properties

* Removes -> Destroys..
 2022-01-17 23:18:41 -05:00
彭瑞暄andGitHub b8842a34ae Update bundle_zh_TW.properties (#6470) 2022-01-17 21:58:26 -05:00
Anuken cc221d669a Sector bugfix backport 2022-01-17 15:41:45 -05:00
Paweł StolarskiandGitHub 6a75d84f48 Evolveye (polish translator of 3.x version) (#6502) 2022-01-17 14:53:35 -05:00
Vajda SimonandGitHub 9622d6b401 Hungarian server update (#6501) 
with lobby and plugins 😁
 2022-01-16 16:28:23 -05:00
OSPandGitHub 44c28e2af0 [XCore] new server (#6500) 2022-01-16 14:28:31 -05:00
RebornTrack970andGitHub f754f386c9 Added Castle Wars server as a test (#6498) 2022-01-15 10:42:14 -05:00
Matthew (or Maya) PengandGitHub 795edb2494 Tractor Beam Suction multiplies by timescale twice (#6489) 2022-01-13 15:28:29 -05:00
devlaqandGitHub f5701ba3c4 Update servers_v6.json (#6487) 
Change shard server address to 59.12.120.171 for fast connection and stability
 2022-01-12 10:00:46 -05:00
Neba-MDandGitHub 772f3ceb5f Update servers_v6.json (#6485) 2022-01-11 12:57:30 -05:00
OSPandGitHub 4b6a48a30f [XCore] domain change (#6484) 2022-01-11 10:16:33 -05:00
Matthew (or Maya) PengandGitHub 43e857e810 Fix ammo of one item transforming into another. (#6483) 
* Fix ammo transmutation

* Small fixes

* small fix 2

* a

* commit spam aeugh
 2022-01-11 09:29:25 -05:00
PhinnerandGitHub cd88400154 Better Mod/Plugin dependencies handling (#6328) 
* Dependencies goes brrrr

* mmh, maybe voiding exception in findMeta ?

* Let Anuke code handle everything

I trust the Cat :^)

* My god, I sleep too much...

* Forgot that one...
 2022-01-10 23:43:11 -05:00
Matthew (or Maya) PengandGitHub 1d14fa78bf Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Volas171andGitHub 02db63aa91 update omega ips (#6482) 2022-01-10 18:13:07 -05:00
OSPandGitHub 4eab4ab569 [XCore] update ip (#6481) 2022-01-09 17:00:46 -05:00
Yuri PolyakovandGitHub 12a8797019 Add server to global (#6479) 
* Add server to global

* Ня
 2022-01-09 11:37:48 -05:00
KotMilkMeoWandGitHub 030d66fb73 MeowLand cumeback (#6478) 
👀
 2022-01-09 10:06:35 -05:00