Anuken 5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ...

 Conflicts:

	core/src/mindustry/type/UnitType.java

	gradle.properties

2021-11-04 19:39:16 -04:00

..

abilities

More branch merging

2021-10-14 20:58:03 -04:00

bullet

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-10-31 13:33:46 -04:00

comp

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-11-04 19:39:16 -04:00

effect

Fixed #5958

2021-09-08 08:42:23 -04:00

units

tungsten

2021-11-02 14:49:05 -04:00

Damage.java

Fixed #6287

2021-11-02 09:04:37 -04:00

Effect.java

Why was this false

2021-10-29 20:16:37 -04:00

EntityCollisions.java

Cleanup

2021-08-22 00:36:25 -04:00

EntityGroup.java

More misc cleanup

2021-03-17 17:39:50 -04:00

Fires.java

Oyxgen env

2021-08-20 10:06:16 -04:00

GroupDefs.java

Added WorldLabel entity for better server-side labels

2021-11-02 10:03:44 -04:00

Leg.java

no IK

2020-06-08 10:46:19 -04:00

Lightning.java

Allow for dynamic laser absorption and insulation (#5047)

2021-10-05 12:36:29 -04:00

Predict.java

Turret accurateDelay parameter

2021-07-20 17:55:00 -04:00

Puddles.java

slurp

2021-10-05 21:46:41 -04:00

Sized.java

Partial 7.0 merge - API preview

2021-06-02 11:08:08 -04:00

TargetPriority.java

...

2020-05-21 21:15:39 -04:00

Units.java

Display infinity symbol for "unlimited" unit cap

2021-11-01 12:27:00 -04:00

UnitSorts.java

Basic unitsorts for hjson (#6280)

2021-10-31 21:30:35 -04:00