mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-12 10:59:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,401 Commits 4 Branches 160 Tags 2.3 GiB
b74cf71f40
Commit Graph

6401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick 'Quezler' Mounier
93faf128b7
Bump up the chain to update in unison 2020-01-29 10:12:18 +01:00
Patrick 'Quezler' Mounier
56b2cc2745
Fix unloading on a corner 2020-01-29 09:05:00 +01:00
Patrick 'Quezler' Mounier
d2869b976d
Fix comment in 〃 2020-01-29 09:04:46 +01:00
Patrick 'Quezler' Mounier
432b555f1b
Optimize with sleeps 
Ehmm i meant recharge cycles, beep boop.
 2020-01-29 09:02:53 +01:00
Patrick 'Quezler' Mounier
db1a2ddc64
Move start & end logic into entity snek bits 2020-01-29 08:03:53 +01:00
Patrick 'Quezler' Mounier
88282a8c0b
Prevent turns from being considered the end 2020-01-29 07:48:14 +01:00
Prosta4okua
6a48a1e0a3
Update bundle_uk_UA.properties 2020-01-29 01:12:12 +02:00
Prosta4okua
d0faecbea5
Update bundle_uk_UA.properties 2020-01-29 01:07:24 +02:00
Vamist
b5ccd36315 [Added] Players command 
Allows servers to view current active players in more detail without having to use status
 2020-01-28 20:16:06 +00:00
Patrick 'Quezler' Mounier
4674e5ad68
Merge branch 'master' into crater 2020-01-28 20:06:16 +01:00
Anuken
97cfc33abb Merge remote-tracking branch 'origin/master' 2020-01-28 13:44:13 -05:00
Anuken
867a642859 Fixed #1460 2020-01-28 13:44:06 -05:00
Anuken
d99cad8793
Update SERVERLIST.md 2020-01-28 13:28:34 -05:00
kf-games
2a11f65e10 Add server MINDUSTRY.RU (#1463) 
Add server MINDUSTRY.RU
Server 24/7 Online
380+ Maps
Have a motd
There are moderators
Server in uninterrupted operation since October 2019
 2020-01-28 13:05:55 -05:00
Patrick 'Quezler' Mounier
babe00245a
Comment on crater-deploy.sh 2020-01-28 14:52:09 +01:00
Patrick 'Quezler' Mounier
ff578c8540
Repurpose branch to be played 
When anuke shows more interest in this branch the changes that stem from this can be reversed and squashed, but people want to play it, and keeping 2 crater related branches in sync is frankly a pain 😗
 2020-01-28 14:31:32 +01:00
Patrick 'Quezler' Mounier
445126ea65
Rename Track to CraterConveyor 
though it does not extend the conveyor class.
 2020-01-28 11:41:20 +01:00
Patrick 'Quezler' Mounier
2683c74800
Avoid assigning new object? 2020-01-28 11:10:23 +01:00
Patrick 'Quezler' Mounier
61197fe974
Remove duplicate code between first & take 2020-01-28 11:08:40 +01:00
Patrick 'Quezler' Mounier
89d143af8f
Undo part of 〃 2020-01-28 11:00:08 +01:00
Patrick 'Quezler' Mounier
0f92f77b55
Draw crater unto plastanium conveyor icon 
And remove whitespaces from the emoji one.
 2020-01-28 10:57:51 +01:00
Patrick 'Quezler' Mounier
683211cb1f
Untangle conveyor entanglement 
Made track a standalone block due to the influx of conveyor code changes, and if it were ever to return it would make sense to also include the conduits in one form or another, like a 🐍 class/trait/abstract/method/etc
 2020-01-28 10:41:30 +01:00
Patrick 'Quezler' Mounier
af83d08fb1
FIx inconsistencies in the diff 2020-01-28 07:59:11 +01:00
Patrick 'Quezler' Mounier
28765ef909
Merge branch 'master' into crater 2020-01-28 07:45:03 +01:00
Anuken
89e1c5afc0 Conveyor tweaks 2020-01-28 00:21:05 -05:00
Anuken
a2933e030a More severe votekick 2020-01-27 15:43:17 -05:00
Patrick 'Quezler' Mounier
8edcebd3a6
Undo moving other bundle keys into their place 
Should be a different commit/pull
 2020-01-27 19:42:27 +01:00
Patrick 'Quezler' Mounier
6eb6870bb6
Register crater emoji via ui folder 
#1458
 2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
038fc72d7b
Merge branch 'master' into crater 2020-01-27 19:17:22 +01:00
Anuken
d21c47a582 Merge remote-tracking branch 'origin/master' 2020-01-27 13:15:15 -05:00
Anuken
5ad0193a86 Fixed reduced conveyor edge throughput 2020-01-27 13:15:12 -05:00
MWestfall
881eca636d Update servers.json (#1457) 2020-01-27 12:55:18 -05:00
Patrick 'Quezler' Mounier
2e3f7d8db2
Merge branch 'master' into crater 2020-01-27 18:40:51 +01:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji 2020-01-27 18:40:40 +01:00
Daniel Jennings
d849a3a87f Adding Steam Rich Presence support. (#1453) 
* Steam Rich Presence support. I opted to put this code inside of
DesktopLauncher.java instead of SNet.java because it heavily overlaps
with the work the DiscordRPC code was already doing.

Testing wasn't easy because I had to figure out how the Steam version
actually runs normally, but it was straightforward once I figured out
what version information to slam into the JAR and fixed 'desktop:steamtest' to work locally with my paths.

Because of how Steam currently expects SetRichPresence to be used, I had
to upload to the Steam partner site a trivial Rich Presence loc token
called 'steam_status_raw' that just gets entirely substituted for the
'steam_status' RP token string. I didn't expect that I'd need to do
anything for localization support (and instead just let it use English
for everyone like Discord) but apparently Steam isn't happy if you
directly set 'steam_display' to a raw string (but I'm going to look at
that when I'm back at work because I don't know that we need that
requirement.)

* Whoops, left this in there from debugging the Steam connection.

* Fixing coding style, and also triggering another CI build
 2020-01-27 12:17:52 -05:00
Patrick 'Quezler' Mounier
9a289c83e6
Fuse with conveyor optimization 
# Conflicts:
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-27 18:06:48 +01:00
Anuken
5ebc04ab29
Update SERVERLIST.md 2020-01-27 11:59:17 -05:00
Anuken
379f860a6b Merge remote-tracking branch 'origin/master' 2020-01-27 11:01:57 -05:00
Anuken
65211a6021 Fixed #1447 2020-01-27 11:01:48 -05:00
Anuken
9395fa99be
Create SERVERLIST.md 2020-01-27 10:50:08 -05:00
Anuken
b7e1adb8b1 Fixed 103 network compatibility 2020-01-27 10:19:18 -05:00
Petr Gašparík
315260f7f5 Czech translation - fix typos 2020-01-27 14:14:43 +01:00
Petr Gašparík
69069e2ef3 Czech translation - mod display 2020-01-27 11:32:31 +01:00
Petr Gašparík
de143a8e16 Czech translation for 103.x changelog 2020-01-27 11:30:23 +01:00
Anuken
b9e8694e68 Added synced server label + effect methods 2020-01-27 00:25:32 -05:00
Anuken
cd1ed97e52 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-01-27 00:11:24 -05:00
Anuken
a61234d21e Minor tweaks 2020-01-26 21:50:55 -05:00
키에르
9499b9dfaf Add custom text on screen (#1448) 2020-01-26 17:56:11 -05:00
Anuken
9baaacc8ac Crash fix 2020-01-26 16:55:24 -05:00
Anuken
db3d4b170f Merge branches 'conveyor-refactor' and 'master' of https://github.com/Anuken/Mindustry 2020-01-26 16:12:35 -05:00