Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,013 Commits 4 Branches 180 Tags
v141
Commit Graph
16013 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 67d87f023b Cleanup 2020-04-22 14:22:33 -04:00
Anuken da7c393096 progress 2020-04-22 12:47:29 -04:00
Anuken b3f936acb8 Fixed tests not compiling 2020-04-22 11:18:19 -04:00
Anuken 2ca62831e3 Revert "Cleaned up tests" (wrong branch) 2020-04-22 11:17:47 -04:00
Anuken cb601b729e Merge remote-tracking branch 'origin/master' 2020-04-22 10:48:54 -04:00
Anuken cc4e9c5ba1 Cleaned up tests 2020-04-22 10:48:50 -04:00
Anuken a592144291 Catching of schematic preview errors / Fixes #1886 2020-04-22 09:49:04 -04:00
Kaio Duarte CostaandGitHub 390b5e3b60 Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725andGitHub 05cfe7a80a Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Anuken 58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Patrick 'Quezler' Mounier 561198f517 Fix issue with uneven dumping 2020-04-18 13:39:12 +02:00
Patrick 'Quezler' Mounier 16a1483f55 Require 4 loading docks to saturate a belt 
Which encourages using them right from the factory, instead of simply connecting it up to a full titanium belt.
 2020-04-18 13:28:32 +02:00
Anuken eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
AnukenandGitHub c5c63c24d5 Update bug_report.md 2020-04-16 17:00:07 -04:00
Patrick 'Quezler' Mounier 32e32ecae2 Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Anuken 280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Patrick 'Quezler' Mounier 1acc6461e6 Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier 9864383300 Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier 41eb51a340 Experiment with visible ports 2020-04-16 21:11:59 +02:00
Felix CorvusandGitHub 07ae854dec A:b:uke fixes 
see: https://github.com/Anuken/Mindustry/pull/1877#issuecomment-614645700
 2020-04-16 22:02:40 +03:00
Patrick 'Quezler' Mounier da99286826 Remove obsolete valid check 2020-04-16 20:33:52 +02:00
Patrick 'Quezler' Mounier 79a095faa8 Merge branch '6.0' into crater 2020-04-16 20:30:13 +02:00
Anuken 2f3a842f2e isValid() workaround 2020-04-16 14:26:09 -04:00
Patrick 'Quezler' Mounier a05f4338c5 Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
Anuken 2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
CorbyandGitHub 15750b5eb0 Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Patrick 'Quezler' Mounier 361a540ed3 Merge branch '6.0' into crater 2020-04-16 19:10:10 +02:00
Patrick 'Quezler' Mounier a83546bc9d Call bumps & upstreams from the objects themselves 2020-04-16 19:01:27 +02:00
Patrick 'Quezler' Mounier e66a1a92c3 Phase out the need for isSleeping 
Thanks to knowledge gained from the previous commit.
 2020-04-16 18:56:00 +02:00
Patrick 'Quezler' Mounier b599bafd5e Override isvalid for sleeping craters 2020-04-16 18:48:38 +02:00
Patrick 'Quezler' Mounier 589d4c92d1 Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier b9b8a4a2f7 Move update function up 
It felt wrong to put it down below.
 2020-04-16 18:17:00 +02:00
Patrick 'Quezler' Mounier 7df44ec060 Implement anuke’s size calculation 2020-04-16 18:12:51 +02:00
Patrick 'Quezler' Mounier 83511368f6 Stash shadow draft 2020-04-16 17:44:43 +02:00
Anuken c6bbdfdc9b Fixed compilation 2020-04-16 11:35:35 -04:00
Anuken 713dbccf74 Bugfixes 2020-04-16 11:30:42 -04:00
Patrick 'Quezler' Mounier a1d4804fae Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00
Anuken a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken 256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Anuken ea0358d570 Merge remote-tracking branch 'origin/6.0' into 6.0 2020-04-16 09:44:36 -04:00
Anuken 42f227195c Better payload framework 2020-04-16 09:44:31 -04:00
Ali-C-IlaandGitHub 7d6e8fdcd1 Update bundle_zh_TW.properties (#1876) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-04-16 09:14:36 -04:00
Patrick 'Quezler' MounierandGitHub 7254204ae5 [6.0] fix build requirement check for sandbox (#1873) 
* Fix not being able to start building in 6.0 sandbox

* Make 〃 more logical
 2020-04-16 09:11:23 -04:00
VanguardandGitHub 0cde4a9778 Merge branch 'master' into master 2020-04-16 15:44:04 +03:00
VanguardandGitHub bfe701bd08 5 lines changed (yet again) 2020-04-16 15:17:35 +03:00
VanguardandGitHub 2a47c22607 5 lines changed (fixed) 
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin
 2020-04-16 15:15:25 +03:00
Patrick 'Quezler' Mounier 5c28985ee6 Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
 2020-04-16 12:39:52 +02:00
Patrick 'Quezler' Mounier 424e58ff7d Merge branch 'master' into crater 2020-04-16 11:20:16 +02:00
Anuken 8a01b87c99 Cleanup 2020-04-15 23:12:18 -04:00
Anuken 79c8548171 Better conveyor animations 2020-04-15 19:05:18 -04:00