Patrick 'Quezler' Mounier
424e58ff7d
Merge branch 'master' into crater
2020-04-16 11:20:16 +02:00
Blockzilla101
501253d13a
added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog ( #1846 )
...
* added name of player to baning/kicking/vote-kicking/admining
* slight tweaks
* fixed redundant things
2020-04-12 10:52:05 -04:00
Patrick 'Quezler' Mounier
9e811be477
Name which map name has a conflict when importing ( #1844 )
2020-04-12 09:56:36 -04:00
Vanguard
4c9b034153
Updated Phantom description ( #1809 )
...
Added info "Rebuilds destroyed blocks"
2020-04-03 08:21:39 -04:00
Patrick 'Quezler' Mounier
74e94e5344
Merge branch 'master' into crater
2020-04-02 12:05:04 +02:00
fuzzbuck
643d054294
Add search bar in playerlist ( #1572 )
...
* add "search" bar in playerlist
* remove log.info
* clear keyboard focus & text on toggle
* refactor sField -> field (fixes build??)
* refactor field -> sField (revert) should build now 👍
* remove drawEach boolean, simplify everything (please ignore previous commits)
* escape color codes
* use Strings.stripcolors & check for & without color codes
2020-03-26 19:01:24 -04:00
NickZhYT
281f2f7a64
Update bundle.properties ( #1747 )
...
Some description edits
2020-03-26 18:40:34 -04:00
Anuken
d346442e86
Changed "global" -> "community" servers
2020-03-26 12:39:54 -04:00
Patrick 'Quezler' Mounier
4f195b72d1
Merge branch 'master' into crater
2020-03-15 22:00:51 +01:00
ma44
ec34e27102
map setting refund ( #1709 )
2020-03-15 14:02:47 -04:00
Anuken
d7f9090c0b
Fixed #1672
2020-03-09 09:41:39 -04:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly
2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts
2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description
2020-03-05 10:50:08 +01:00
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
Anuken
f88fe898ff
Updated bundle
2020-03-01 21:23:50 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency ( #1593 )
...
* new branch
* Separate ambient light and solar panel efficiency
* Made ambient light -> solar efficiency default
2020-02-21 11:38:56 -05:00
Anuken
32dcae8fd3
Update bundle.properties
2020-02-19 13:49:40 -05:00
Anuken
4a55dde5ee
Bugfixes
2020-02-18 19:54:35 -05:00
Anuken
2038409283
Removed schematic replacement dialog
2020-02-18 11:35:28 -05:00
Anuken
0678f54e25
Fixed bloom darkening sprites / Changed pixelate desc
2020-02-13 10:17:43 -05:00
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater
2020-02-06 19:33:57 +01:00
Anuken
a5fd881f8d
Full implementation of #1494
2020-02-05 19:01:53 -05:00
Patrick 'Quezler' Mounier
05ccdfd51b
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-02-05 10:26:34 +01:00
Anuken
2721aa550d
Implemented #1444
2020-01-30 22:56:17 -05:00
Patrick 'Quezler' Mounier
8edcebd3a6
Undo moving other bundle keys into their place
...
Should be a different commit/pull
2020-01-27 19:42:27 +01:00
Patrick 'Quezler' Mounier
58a79d8631
Update to v103
...
# 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/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-24 20:25:03 +01:00
Anuken
63c277f78e
Implemented mod name display in content desc
2020-01-24 10:26:10 -05:00
Anuken
d031efe1f2
Added Steam player limit + reduced votekick cooldown
2020-01-23 17:49:53 -05:00
Anuken
235142c869
Implemented #1093
2020-01-23 15:50:03 -05:00
Anuken
26676d60e1
Added underflow gates
2020-01-20 18:54:25 -05:00
Anuken
c3d2351b2d
Various icon changes
2020-01-17 13:57:04 -05:00
Anuken
ce18e32826
Added font icon generate+merge pipeline
2020-01-16 17:05:20 -05:00
Anuken
3eaeac3618
Testing icon font
2020-01-16 11:10:53 -05:00
Anuken
7e7d2019af
Made Android files external
2020-01-11 19:21:16 -05:00
Patrick 'Quezler' Mounier
ed765ad10a
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
2020-01-10 12:02:07 +01:00
J-VdS
9b82333a69
typo ( #1343 )
2020-01-08 17:36:58 -05:00
Anuken
a7cddf97b8
Implemented bridge opacity from #1006
2020-01-08 16:16:19 -05:00
Anuken
8f208920f7
Merged in liquid void
2020-01-08 11:04:12 -05:00
Patrick 'Quezler' Mounier
9b55eeaa38
Rename batches to something simpler
2020-01-06 18:04:56 +01:00
Patrick 'Quezler' Mounier
1a177ef239
Rephase dotted
2020-01-06 18:00:43 +01:00
Patrick 'Quezler' Mounier
207d95dbd8
Refractor away throughput stat
2020-01-06 17:57:14 +01:00
Patrick 'Quezler' Mounier
c6299c8f2c
Add throughput stat entry
2020-01-05 15:28:28 +01:00
Patrick 'Quezler' Mounier
095c65f36c
Remove crater from bundle
2020-01-04 21:10:09 +01:00
Patrick 'Quezler' Mounier
e2d0ab5161
Move bundle entries around
2020-01-03 17:42:05 +01:00
Patrick 'Quezler' Mounier
73040de839
Change bundle description
2020-01-03 17:41:05 +01:00
Patrick 'Quezler' Mounier
f0bfe24008
Remove crater bundle entry
2020-01-02 21:34:56 +01:00
Patrick 'Quezler' Mounier
1bcfc69206
Tweak stat pages
2020-01-01 14:01:54 +01:00
Patrick 'Quezler' Mounier
c3186b63ce
Rename compression to plastanium
...
Breaking change.
2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
20a511d940
Merge branch 'master' into crater
2019-12-29 20:50:55 +01:00
