Anuken
8798fa101a
Merge
2019-11-16 00:15:45 -05:00
Anuken
1f6ef9d9ae
Merge remote-tracking branch 'origin/master'
2019-11-15 21:12:12 -05:00
Anuken
e6afe584e5
Fixed 'underwater' ores
2019-11-15 21:12:08 -05:00
Fayti1703
76c63443af
Deduplicate requirements assignment for Tar Fields ( #1065 )
2019-11-15 20:02:27 -05:00
Joshua Fan
cafd95859f
Clean up text capitalization, misc UI ( #1072 )
2019-11-15 20:01:59 -05:00
Anuken
016823d446
Bridge cleanup
2019-11-14 18:53:24 -05:00
Anuken
0cf9ef66fa
Merge remote-tracking branch 'origin/master'
2019-11-14 18:48:21 -05:00
Anuken
1f583dc7a2
Bugfixes
2019-11-14 18:48:12 -05:00
Patrick 'Quezler' Mounier
836e72119c
🗜 Pressure conduit ( #949 )
...
* Suggest pressure conduit
* Revert "Suggest pressure conduit"
This reverts commit 721dd9255e
2019-11-14 15:21:29 -05:00
Anuken
618a050414
Fix getProgressIncrease
2019-11-14 15:02:09 -05:00
Anuken
ec7f49c94b
Merge remote-tracking branch 'origin/master'
2019-11-14 14:59:10 -05:00
Anuken
30ea285ca0
Change power "satisfaction" -> "status", use efficiency() in blocks
2019-11-14 14:59:04 -05:00
Joshua Fan
a9b822089f
Make Esc mirror back button behavior in settings ( #1061 )
2019-11-14 14:41:15 -05:00
Anuken
c5a4d7331f
Switched to using core attack events
2019-11-14 14:40:42 -05:00
Anuken
230428f2e0
Update CoreBlock.java
2019-11-14 12:35:59 -05:00
Anuken
1a26a1bf63
Update CoreBlock.java
2019-11-14 12:28:35 -05:00
Anuken
77001324e9
Update EventType.java
2019-11-14 09:59:33 -05:00
Anuken
0fd6207689
Cleanup
2019-11-14 08:51:12 -05:00
Anuken
dd175747ab
Permissive extensions
2019-11-13 19:40:03 -05:00
Anuken
3106389f6a
Switched to HJson content parsing
2019-11-13 19:12:12 -05:00
Anuken
d8c997b355
Methods renamed / Better build request handling
2019-11-12 23:40:45 -05:00
Anuken
103f655fa4
Removed boolean usage
2019-11-12 15:59:44 -05:00
Anuken
1dfaf3897c
Proper node intersect
2019-11-12 08:23:23 -05: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
Joshua Fan
dcdec7f55f
Add mouse-based movement ( #1037 )
...
* Add mouse-based movement
* Rename keybind to 'Follow Mouse'
2019-11-11 14:00:35 -05:00
Anuken
8952dd7f56
Begin work on 6.0
2019-11-10 14:05:29 -05:00
iczero
fbb1f012e2
Add item and amount properties to DepositEvent ( #1025 )
2019-11-10 10:15:52 -05:00
Anuken
4c0607aba8
Bugfixes
2019-11-09 17:19:29 -05:00
Anuken
2af13a31dc
Bugfixes
2019-11-09 16:36:28 -05:00
Anuken
2dec6af231
Merge remote-tracking branch 'origin/master'
2019-11-09 15:30:12 -05:00
Anuken
c70fb5940f
Display document import errors on iOS
2019-11-09 15:30:02 -05:00
danmw3
ee88cd33b1
Allow for toggling the visibility of power line lasers ( #1022 )
...
* Allow for toggling the visibility of power line lasers
Configurable key-bind in controls and obeys the power line opacity setting.
* Last power opacity is saved after being toggled off.
* Moved key-bind into the View category.
2019-11-09 00:00:02 -05:00
Anuken
fb15c44383
Fix links in a hacky way
2019-11-08 21:11:49 -05:00
Anuken
4f4113d3d1
Merge remote-tracking branch 'origin/master'
2019-11-08 19:09:45 -05:00
Anuken
52355de1c0
use // for comments
2019-11-08 19:08:07 -05:00
iczero
ebee4fa5da
Implement build autopausing ( #1017 )
...
Automatically pause building after current build queue is empty
2019-11-08 16:56:06 -05:00
키에르
796241b40a
Add TapEvent/TapConfigEvent ( #1018 )
...
* Update EventType.java
* Update InputHandler.java
2019-11-08 14:58:24 -05:00
Anuken
505f802e20
Use ## for comments, just in case
2019-11-08 14:55:32 -05:00
Anuken
e9f9194f73
Added json comments
2019-11-08 14:40:15 -05:00
Anuken
effd4e959a
Power cleanup
2019-11-08 13:04:24 -05:00
Patrick 'Quezler' Mounier
f58eb75639
🐬 Factorio flavoured powerlines ( #997 )
...
* Stash initial prototype
* Fix 〃to connect the chain
* Add comments
* Hook onto convejor pathfinding
* Cleanup remnant discovered via pull request diff
* Toggle placement between diagonal and pathfinding
* Stash questionable prototype
* 〃
* Attempt to rewrite away the skip array
* Revert "Attempt to rewrite away the skip array"
This reverts commit 12753a9b5c
2019-11-08 12:28:49 -05:00
Anuken
8b2934c60e
Update ForceProjector.java
2019-11-07 19:05:15 -05:00
Anuken
d05f56c5b1
Cleanup
2019-11-07 17:16:09 -05:00
Anuken
d1196f8e85
Fixed #745
2019-11-07 16:55:26 -05:00
Anuken
1e7c21c1ae
Bugfixes
2019-11-06 13:59:35 -05:00
Anuken
82ae378edc
Fixed mech pads not working
2019-11-05 21:51:58 -05:00
Anuken
ccac67ced6
Fixed unit tests, power problems
2019-11-05 19:20:23 -05:00
Anuken
0738a7dbf0
Merge remote-tracking branch 'origin/master'
2019-11-05 18:09:49 -05:00
Anuken
a539bb8e57
Better oil bar color
2019-11-05 17:58:30 -05:00
