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
Patrick 'Quezler' Mounier
9bc24ae47a
Darken yellow square on nucleus core ( #1497 )
...
#1496
2020-02-03 08:51:19 -05:00
Patrick 'Quezler' Mounier
0f92f77b55
Draw crater unto plastanium conveyor icon
...
And remove whitespaces from the emoji one.
2020-01-28 10:57:51 +01:00
Patrick 'Quezler' Mounier
6eb6870bb6
Register crater emoji via ui folder
...
#1458
2020-01-27 19:33:36 +01:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji
2020-01-27 18:40:40 +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
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
eaa86023f9
Visual tweaks
2020-01-14 17:07:39 -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
Anuken
8f208920f7
Merged in liquid void
2020-01-08 11:04:12 -05:00
Patrick 'Quezler' Mounier
5f047603bf
Revert "Blend prototype"
...
This reverts commit 35afc94d34
2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier
5c485eff04
Ressurect OG corner
2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier
0f2f8f2411
Revert "Stash cursed loading dock"
...
This reverts commit 9bdf475049
2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier
9bdf475049
Stash cursed loading dock
2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier
35afc94d34
Blend prototype
2020-01-08 10:27:06 +01:00
Patrick 'Quezler' Mounier
f6af699428
Revert " 🎩 "
...
This reverts commit 10e4268dd5
2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier
0b0007502f
Revert "Differentiate texture from armored conveyor"
...
This reverts commit 59451fcc0b
2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b
Differentiate texture from armored conveyor
...
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
2020-01-03 17:09:06 +01:00
Patrick 'Quezler' Mounier
0ae6527584
Sacrifice hivemind to convert craters to drawings
...
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.
Forgive me future ai overlord <3
2020-01-02 21:29:19 +01:00
Patrick 'Quezler' Mounier
10e4268dd5
🎩
...
Leaving this here until it gets merged or something :)
2020-01-02 09:02:37 +01:00
Patrick 'Quezler' Mounier
c3186b63ce
Rename compression to plastanium
...
Breaking change.
2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
56351b427b
Revert "Attempt to remove unused regions"
...
This reverts commit 4f5b737f7c
2019-12-30 10:53:50 +01:00
Patrick 'Quezler' Mounier
4f5b737f7c
Attempt to remove unused regions
...
Failed, conveyor code depends to much on it, gonna revert this.
2019-12-30 10:53:45 +01:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter
2019-12-27 20:45:27 +01:00
Patrick 'Quezler' Mounier
f89af1b26a
Override inverted sorter arrow colours ( #1252 )
...
Override hex’s of the arrows by those of the unloader.
2019-12-24 00:32:04 -05:00
Patrick 'Quezler' Mounier
c279fda5e4
Suggest liquid void sprite
...
Uses the color of the corner(s) for the inner ring, just like how the item void is colored based on the item source.
2019-12-23 17:24:38 +01:00
ado1928
5e568eac0d
Added Feathub to the "About" tab ( #1234 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update Links.java
2019-12-19 19:33:24 -05:00
TsjipTsjip
2366d25de7
Add liquid void block.
2019-12-12 21:11:14 +01:00
Anuken
a5fbc07561
Texture overrides / Potential mod texture binding optimizations
2019-11-25 20:50:32 -05:00
Patrick 'Quezler' Mounier
7830372477
Beep boop add f-droid ( #1087 )
...
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -05:00
Anuken
9b732017a9
Added contribution guide
2019-11-18 00:55:33 -05:00
Anuken
fad6fe9a2a
Added armored conduit / Lighting improvements / Moved liquid package
2019-11-17 13:51:36 -05:00
Anuken
84968c9f73
Added color picker / Customizable lighting rules
2019-11-16 23:27:42 -05:00
Anuken
913a703d41
Illuminator textures
2019-11-16 20:06:11 -05:00
Anuken
faf64f11f2
More lights
2019-11-16 19:57:33 -05:00
Patrick 'Quezler' Mounier
8a089ba3c9
Resolve conflicts
...
# 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
2019-11-12 08:44:26 +01:00
Anuken
56917483d6
Cleaned up diode
2019-11-11 23:32:49 -05:00
Patrick 'Quezler' Mounier
f5c1eb74af
🔩 Add (plastanium) diode ( #964 )
...
* Add plastanium diode
* Only rotate the arrow part
* Use the sum of graph batteries from both sides
* Make diode send power overflow
Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.
* Remove redundant block != null check
* Remove free power
* Stash
* Revert "Stash"
This reverts commit 0c14854519
2019-11-11 23:29:03 -05:00
Anuken
52f592a357
Lighting improvements
2019-11-10 16:18:47 -05:00
Anuken
c70fb5940f
Display document import errors on iOS
2019-11-09 15:30:02 -05:00
Patrick 'Quezler' Mounier
8e2c12848c
Add a cap against leaking
...
Doesn’t fully prevent leaking, there are intentional gaps, but its significantly slower.
2019-11-05 14:30:46 +01:00
Patrick 'Quezler' Mounier
521da56e70
Add plated conduits
...
Went with “plated” instead of “armored” since the titanium one wasn’t named like the conveyors as well.
2019-11-05 14:00:50 +01:00
Anuken
91dc25f69d
Mobile schematics / Randomized projector reloads
2019-10-31 22:44:07 -04:00
Patrick 'Quezler' Mounier
bd5c98cc0d
🚧 Add insulator wall ( #840 )
...
* Stash insulator prototype
* Fix automatic wires when placing non-powernodes
* Implement requested changes
Stopping lightning has yet to be added.
* ❤️
* Implement lightning absorption
* Visually distinguish insulated power lines
* Stop lightning infront of wall
* Highlight insulators instead of recipients
* Attempt to implement requested changes
* Implement requested changes
* Remove spaces between if and (
* Snap lightning to insulated blocks
* Update bundle.properties
2019-10-27 17:41:00 -04:00
Anuken
ef2817513a
Layout fixes
2019-10-27 16:26:33 -04:00
Anuken
7179b147b2
Added Reddit link
2019-10-23 20:13:22 -04:00
Anuken
e4b267d757
Merge pull request #838 from ado1928/master
...
Added more rubble pngs
2019-10-20 16:32:07 -04:00
ado1928
7fdbd27ebb
Add files via upload
2019-10-19 10:58:34 +02:00
Anuken
4977f598fd
Config drawing
2019-10-17 21:58:49 -04:00
