Patrick 'Quezler' Mounier e5e4884448 Merge branch 'master' into crater ...

# Conflicts:
#	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/world/modules/ItemModule.java

2020-03-05 10:00:02 +01:00

..

dialogs

Merge branch 'master' into crater

2020-03-05 10:00:02 +01:00

fragments

Remember scroll position when a new message gets added (#1638)

2020-02-25 12:06:18 -05:00

layout

[formatting] add newline to file(s) (#1508)

2020-02-05 18:36:56 -05:00

Bar.java

More plugin customization / Renamed Rectangle

2019-12-26 22:44:15 -05:00

BorderImage.java

it is done

2019-12-25 01:39:38 -05:00

Cicon.java

it is done

2019-12-25 01:39:38 -05:00

ContentDisplay.java

Implemented mod name display in content desc

2020-01-24 10:26:10 -05:00

Fonts.java

Fixed annotation source version warnings

2020-01-22 15:59:02 -05:00

GridImage.java

it is done

2019-12-25 01:39:38 -05:00

IconSize.java

it is done

2019-12-25 01:39:38 -05:00

IntFormat.java

it is done

2019-12-25 01:39:38 -05:00

ItemDisplay.java

it is done

2019-12-25 01:39:38 -05:00

ItemImage.java

Visual tweaks

2020-01-14 17:07:39 -05:00

ItemsDisplay.java

Fixed small launch items button

2020-02-07 20:51:59 -05:00

Links.java

Changed feathub link

2020-02-22 19:32:01 -05:00

LiquidDisplay.java

Visual tweaks

2020-01-14 17:07:39 -05:00

Minimap.java

New, improved minimap / Bugfixes

2019-12-29 17:56:10 -05:00

MobileButton.java

it is done

2019-12-25 01:39:38 -05:00

MultiReqImage.java

it is done

2019-12-25 01:39:38 -05:00

ReqImage.java

it is done

2019-12-25 01:39:38 -05:00

Styles.java

it is done

2019-12-25 01:39:38 -05:00