mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 20:33:50 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,547 Commits 4 Branches 160 Tags 2.3 GiB
634ece405f
Commit Graph

15547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Epowerj
634ece405f Added karst and crossroads to campaign 2022-10-18 22:48:15 -04:00
Epowerj
95abcddbc6 Progress on crossroads 2022-10-18 21:56:28 -04:00
Anuken
1ea89190d4 Merge remote-tracking branch 'origin/master' 2022-10-18 12:56:12 -04:00
Anuken
769c0782f4 Bundle planet description fix 2022-10-18 12:56:07 -04:00
Angel-24
908842f556
Update bundle_es.properties (#7686) 
* Update bundle_es.properties

* Update bundle_es.properties

Naii-the-Baf and Uriel's reviews.
 2022-10-18 10:28:27 -04:00
Anuken
64d5805bc2 Crossroads starting water fix 2022-10-18 09:38:14 -04:00
Anuken
1dd001e137 Merge remote-tracking branch 'origin/master' 2022-10-18 09:26:49 -04:00
Anuken
e6de58fbdc Fixed #7738 2022-10-18 09:26:44 -04:00
Epowerj
ca2973936d Progress on crossroads 2022-10-17 19:42:48 -04:00
Epowerj
0d86cc3f97 Progress on crossroads 2022-10-17 18:32:00 -04:00
Anuken
326002c338 Tank assembler cyanogen requirement 2022-10-17 16:33:10 -04:00
Anuken
b5c730b18d Fixed #7735 2022-10-16 21:51:39 -04:00
Anuken
d644cbd93e Fixed #7733 2022-10-16 21:47:22 -04:00
Anuken
8030caea76 Merge remote-tracking branch 'origin/master' 2022-10-16 08:44:12 -04:00
Anuken
215633587d Fixed #7728 2022-10-16 08:44:08 -04:00
Bill Arndt
c5794ebbda
Update servers_v7.json (#7726) 
Add Eviction v7 servers to community server list.
 2022-10-15 18:04:04 -04:00
Anuken
1ef1aeaaf3 Merge remote-tracking branch 'origin/master' 2022-10-15 18:02:20 -04:00
Anuken
431dc4fe75 Fixed #7725 2022-10-15 18:02:14 -04:00
Github Actions
dee897c6a8 Automatic bundle update 2022-10-15 21:14:11 +00:00
Anuken
b0713721c0 Merge remote-tracking branch 'origin/master' 2022-10-15 17:13:25 -04:00
Anuken
4fa0c55b75 Ground Zero turret supply objective 2022-10-15 17:13:20 -04:00
Epowerj
8fdb3ab540 Tweaks to crossroads 2022-10-15 17:04:34 -04:00
Anuken
e19af8cc98 Fixed map shift field limiting to 3 characters 2022-10-15 16:30:47 -04:00
Anuken
17d527ab05 Merge remote-tracking branch 'origin/master' 2022-10-15 09:41:48 -04:00
Anuken
83ed26a271 Fixed #7719 2022-10-15 09:41:43 -04:00
Epowerj
8a2e7af49e Progress on crossroads 2022-10-14 19:54:27 -04:00
Epowerj
42aafdaf17 Tweaks to karst 2022-10-14 15:09:04 -04:00
Epowerj
6849557300 Renamed karst map file 2022-10-14 14:50:27 -04:00
Anuken
bf6f933686 Merge remote-tracking branch 'origin/master' 2022-10-14 11:54:34 -04:00
Anuken
5a4a6ff003 Fixed #7713 2022-10-14 11:54:30 -04:00
Catchears
7b9e188186
hide world processors in ground zero (#7711) 2022-10-14 07:06:52 -04:00
Anuken
96c996d955 Merge remote-tracking branch 'origin/master' 2022-10-14 07:00:30 -04:00
Anuken
2e684863d5 Fixed #7710 2022-10-14 07:00:26 -04:00
Mechanical fish
bfb92fd859
Add files via upload (#7709) 2022-10-14 06:50:28 -04:00
Anuken
ad76a90683 Fixed #7707 2022-10-13 21:49:41 -04:00
Anuken
291648c8a8 Merge remote-tracking branch 'origin/master' 2022-10-13 16:53:30 -04:00
Anuken
d87c381021 Fixed #7705 2022-10-13 16:53:25 -04:00
Epowerj
fa06b6bda8 Work on crossroads 2022-10-13 16:14:46 -04:00
Epowerj
e804efdf52 Work on crossroads 2022-10-13 14:21:09 -04:00
BalaM314
d6fc4bfdb1
Add Drill.drillEffectChance (for very fast drills) (#7704) 2022-10-13 13:12:03 -04:00
FlippingPotatoes
0ca33477d8
Expand getBlock functionality (#7702) 
* Update LExecutor.java

* Update LUnitControl.java

* Update LExecutor.java

* Update LExecutor.java

* Update LExecutor.java

* Update LExecutor.java

* Update bundle.properties

* Update bundle.properties

* Update bundle.properties

* Update LExecutor.java
 2022-10-13 10:13:17 -04:00
Github Actions
2be787f810 Automatic bundle update 2022-10-13 11:47:26 +00:00
Catchears
e3d1a04626
remove unused entry (#7703) 2022-10-13 07:46:33 -04:00
Epowerj
31212e6e46 Begin work on crossroads 2022-10-12 21:22:27 -04:00
Даркнесс#3729
61e9ffb7e8
Fix WorldReloader (#7701) 
* Fix WorldReloader

* horrible if

* Update WorldReloader.java

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-12 09:50:07 -04:00
MEEPofFaith
201ce276cd
Diodes can work on the wrong tream (#7698) 
* Diodes can work on the wrong tream

* Don't need that check anymore
 2022-10-12 07:57:08 -04:00
Anuken
6def8f5281 Merge remote-tracking branch 'origin/master' 2022-10-11 17:03:58 -04:00
Anuken
1f2ae18b23 Unlock defaults for older campaign saves 2022-10-11 17:03:54 -04:00
Epowerj
363b3f276d Tweaked siege 2022-10-11 16:17:50 -04:00
Epowerj
1b603af6bd Tweaked siege 2022-10-11 16:13:23 -04:00