mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-22 02:07:20 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,446 Commits 4 Branches 160 Tags 2.3 GiB
393d3a19a3
Commit Graph

655 Commits

Author SHA1 Message Date
Anuken
393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken
dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
CancerGuy
3901ae1720
change (#5923) 2021-09-04 10:14:40 -04:00
Anuken
259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken
ced97888e4 why 2021-08-27 21:51:37 -04:00
Anuken
efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken
2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken
5d86390e28 Turret heat cleanup 2021-08-11 10:31:36 -04:00
Anuken
e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Anuken
b1b89290b9 Implemented Anuken/Mindustry-Suggestions/issues/2809 2021-08-07 12:08:30 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken
17e68f7a93 Fixed additive reconstructor center sprite 2021-07-23 19:39:52 -04:00
Anuken
385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
 2021-07-23 17:58:02 -04:00
Anuken
ed1d02d2c2 Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
Anuken
d30c32eddc reorganization 2021-07-22 16:52:05 -04:00
Anuken
0c46d5088c Better laser/blast drill rotators 2021-07-19 14:11:07 -04:00
Anuken
c43fd88f55 lasers. 2021-07-13 17:34:57 -04:00
Anuken
cfb7d29013 Beam drill texture improvements 2021-07-10 18:54:13 -04:00
Anuken
5ceb8e2b48 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-07-09 19:48:35 -04:00
Anuken
b8717b62c8 a 2021-07-08 16:16:53 -04:00
Anuken
1baa82a7c6 Mostly-complete cliff crusher implementation 2021-07-08 16:16:44 -04:00
Anuken
972ca71978 Team-colored force projectors 2021-07-08 12:14:20 -04:00
Anuken
6afb976a44 Payload deconstructor sprite 2021-07-01 17:53:26 -04:00
Anuken
d54b7dc396 WIP payload deconstructor 2021-06-24 12:35:44 -04:00
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken
afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken
4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken
5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken
3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken
93651939f2 stop 2021-06-12 10:55:18 -04:00
Anuken
c4b1bf3e55 Asteroid progress 2021-06-11 19:59:18 -04:00
Anuken
9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
Anuken
c4803d29da Pulverizer texture cleanup 2021-06-10 16:14:53 -04:00
VozDuh
a0acf1a040
Melter & Pulverizer Fixed (#5098) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-06-10 16:01:04 -04:00
Anuken
8c32c00e2b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-09 17:10:49 -04:00
Anuken
b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken
974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-05 11:57:14 -04:00
Anuken
677bad5c60 Fixed #5348 2021-06-04 08:30:16 -04:00
Anuken
fcf1bdd701 Shock mine team region 2021-06-03 21:49:58 -04:00
Anuken
9cd482d389 Minor bugfix 2021-06-03 16:01:51 -04:00
VozDuh
1cbd58820e
Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
Anuken
1c71ee2ed7 Moved bushes into correct directory 2021-06-02 11:24:15 -04:00
Anuken
e9129e6f43 Unspoiled 2021-06-02 11:15:30 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
ThePythonGuy
137792131e
Fix Tetrative Reconstructor's sprite odd 1-pixel error (#5119) 
* Create e

* Delete e

* Add files via upload
 2021-04-17 12:53:57 -04:00
Patrick 'Quezler' Mounier
af20db4cf7
Colorize the inner corners of other conduit sprites (#4978) 2021-03-23 09:44:09 -04:00