aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch/6.0.6'

Browse Source
This commit is contained in:
Cooldude2606
2020-05-26 19:39:09 +01:00
parent 9135608031 4fc51a429b
commit ed574aca11
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
locale/en/gui.cfg
View File

@@ -1,5 +1,5 @@
[player-list] [player-list]
main-tooltip=Player list main-tooltip=Player List
open-action-bar=Options open-action-bar=Options
close-action-bar=Close Options close-action-bar=Close Options
reason-confirm=Confirm Reason reason-confirm=Confirm Reason
@@ -17,7 +17,7 @@ afk-time=__1__% of total map time\nLast moved __2__ ago
open-map=__1__ __2__\n__3__\nClick to open map open-map=__1__ __2__\n__3__\nClick to open map
[rocket-info] [rocket-info]
main-tooltip=Rocket info main-tooltip=Rocket Info
launch-tooltip=Launch rocket launch-tooltip=Launch rocket
launch-tooltip-disabled=Launch rocket (not ready) launch-tooltip-disabled=Launch rocket (not ready)
toggle-rocket-tooltip=Disable auto launch toggle-rocket-tooltip=Disable auto launch
@@ -70,7 +70,7 @@ no-packs=You have not made any science packs yet
[task-list] [task-list]
main-caption=Task List main-caption=Task List
main-tooltip=Task list main-tooltip=Task List
sub-tooltip=Tasks that remain to be done sub-tooltip=Tasks that remain to be done
no-tasks=You have no tasks no-tasks=You have no tasks
last-edit=Last edited by __1__ at __2__ last-edit=Last edited by __1__ at __2__
@@ -83,7 +83,7 @@ discard-tooltip=Remove task
[warp-list] [warp-list]
main-caption=Warp List main-caption=Warp List
main-tooltip=Warp list, must be within __1__ tiles to use main-tooltip=Warp List; Must be within __1__ tiles to use
sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles
too-close=Can't make warp; too close to warp: __1__ too-close=Can't make warp; too close to warp: __1__
last-edit=Last edited by __1__ at __2__\nClick to view on map last-edit=Last edited by __1__ at __2__\nClick to view on map

6
modules/gui/readme.lua
View File

@@ -27,12 +27,14 @@ Gui.element(function(_,parent)
return parent.add{ return parent.add{
type = 'frame', type = 'frame',
direction = 'vertical', direction = 'vertical',
style = 'image_frame' style = 'inside_deep_frame'
} }
end) end)
:style{ :style{
horizontally_stretchable = true, horizontally_stretchable = true,
horizontal_align = 'center' horizontal_align = 'center',
padding = {2, 2},
top_margin = 2
} }
--- Table which has a title above it above it --- Table which has a title above it above it

2
modules/gui/rocket-info.lua
View File

@@ -513,7 +513,7 @@ end)
--- Button on the top flow used to toggle the container --- Button on the top flow used to toggle the container
-- @element toggle_left_element -- @element toggle_left_element
Gui.left_toolbar_button('entity/rocket-silo', {'rocket-info.main-tooltip'}, rocket_list_container, function(player) Gui.left_toolbar_button('item/satellite', {'rocket-info.main-tooltip'}, rocket_list_container, function(player)
return Roles.player_allowed(player,'gui/rocket-info') return Roles.player_allowed(player,'gui/rocket-info')
end) end)