Skip to content

Commit 46a007c

Browse files
scmcgowenmato539MckeksikCanada-LaVearn
authored
Bring staging development to master (#5)
* Update all mods (except create) including forge, remove conflicting mods * Removed maker's mark * Updated MBD2 files * Hello World * add lithosphere (for testing purposes) * update some mods * update some quests * Set Join Server button to point to the new server * Auto: update version * Switch to Solstice Essentials * Auto: update version * removed useless quest lines * update menu screens * update menu for real this time * please work this time * please for real this time * commit v3 final final2 real for real this time * its 2 am and i want to be done * you know already * at this point i should get an award * this one should work <- statement dreamed up by the utterly deranged * Auto: update version * fix misaligned button * Auto: update version * start of quest patch (1st chapter) * Some random things * Auto: update version * remove tree fertilizer recipe * Auto: update version * add tree fertilizer removed tooltip * Auto: update version * Switch to my own build of Solstice * Auto: update version * Add RCC-Chatbox * Auto: update version * Add rcc-library and discord shim * Auto: update version * Set those to server only * Auto: update version * Add Dark utils and interactive * Auto: update version --------- Co-authored-by: mato539 <113927324+mato539@users.noreply.github.com> Co-authored-by: keksi <keksik.youtub@gmail.com> Co-authored-by: Canada <teamgameknight@gmail.com>
1 parent 1a3be74 commit 46a007c

118 files changed

Lines changed: 2332 additions & 1344 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
4.68 MB
Loading

season_6/config/fancymenu/assets/newsplash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Now with 15% more server crashes!
104104
ROLLBACK!
105105
Why can I speak here?
106106
@everyone!
107-
Hosted by Bisect!
107+
Hosted by Lilypad!
108108
100% more Canadian!
109109
Who's in the end?
110110
Too many trains, not enough tracks!

season_6/config/fancymenu/customization/cogsloadingscreen.txt

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,27 @@ type = fancymenu_layout
33
layout-meta {
44
identifier = drippy_loading_overlay
55
render_custom_elements_behind_vanilla = false
6-
last_edited_time = 1720806198566
6+
last_edited_time = 1742790374584
77
is_enabled = true
88
randommode = false
99
randomgroup = 1
1010
randomonlyfirsttime = false
1111
layout_index = 0
1212
custom_menu_title = Create-ive Cogs Season 6
13-
[loading_requirement_container_meta:78b49255-7aee-46fd-95d4-13ac397314fc-1720806118599] = [groups:][instances:]
13+
[loading_requirement_container_meta:598719e0-d91f-4919-883e-b1020e70f406-1742790282947] = [groups:][instances:]
1414
}
1515

1616
customization {
1717
action = setscale
1818
scale = 3.0
1919
}
2020

21+
customization {
22+
action = autoscale
23+
basewidth = 1920
24+
baseheight = 1080
25+
}
26+
2127
menu_background {
2228
color = #242424
2329
background_type = drippy_color_background
@@ -110,7 +116,7 @@ element {
110116
background_texture = [source:local]/config/fancymenu/assets/cogsdark.png
111117
direction = right
112118
progress_for_element_anchor = false
113-
progress_source = 50
119+
progress_source = {"placeholder":"game_loading_progress"}
114120
value_mode = percentage
115121
element_type = progress_bar
116122
instance_identifier = cad940ee-f57a-4f91-934d-0d768c8e3595-1706721495247
@@ -131,63 +137,63 @@ element {
131137
}
132138

133139
vanilla_button {
134-
button_element_executable_block_identifier = 615d3732-2464-4b0c-a22f-0a1a080e91bc-1706720826742
135-
[executable_block:615d3732-2464-4b0c-a22f-0a1a080e91bc-1706720826742][type:generic] = [executables:]
140+
button_element_executable_block_identifier = 0ff60eb7-7c41-4424-8f87-364ce6e3c407-1706720826742
141+
[executable_block:0ff60eb7-7c41-4424-8f87-364ce6e3c407-1706720826742][type:generic] = [executables:]
136142
restartbackgroundanimations = true
137143
loopbackgroundanimations = true
138144
nine_slice_custom_background = false
139145
nine_slice_border_x = 5
140146
nine_slice_border_y = 5
141147
navigatable = true
142148
element_type = vanilla_button
143-
instance_identifier = mojang_logo
144-
appearance_delay = every_time
145-
appearance_delay_seconds = 0.0
146-
fade_in = true
147-
fade_in_speed = 1.5
148-
anchor_point = mid-centered
149-
x = -142
150-
y = -35
151-
width = 285
152-
height = 70
149+
instance_identifier = progress_bar
150+
appearance_delay = no_delay
151+
appearance_delay_seconds = 1.0
152+
fade_in = false
153+
fade_in_speed = 1.0
154+
anchor_point = vanilla
155+
x = 140
156+
y = 294
157+
width = 360
158+
height = 10
153159
stretch_x = false
154160
stretch_y = false
155161
stay_on_screen = true
156-
element_loading_requirement_container_identifier = 3393f009-f8b5-46f1-ab18-58fd52e8fc38-1706720826742
157-
[loading_requirement_container_meta:3393f009-f8b5-46f1-ab18-58fd52e8fc38-1706720826742] = [groups:][instances:]
158-
is_hidden = false
162+
element_loading_requirement_container_identifier = dfad7cf3-dc8a-4dca-8e31-68a6f09bd6a4-1706720826742
163+
[loading_requirement_container_meta:dfad7cf3-dc8a-4dca-8e31-68a6f09bd6a4-1706720826742] = [groups:][instances:]
164+
is_hidden = true
159165
automated_button_clicks = 0
160166
nine_slice_slider_handle = false
161167
nine_slice_slider_handle_border_x = 5
162168
nine_slice_slider_handle_border_y = 5
163169
}
164170

165171
vanilla_button {
166-
button_element_executable_block_identifier = 0ff60eb7-7c41-4424-8f87-364ce6e3c407-1706720826742
167-
[executable_block:0ff60eb7-7c41-4424-8f87-364ce6e3c407-1706720826742][type:generic] = [executables:]
172+
button_element_executable_block_identifier = 615d3732-2464-4b0c-a22f-0a1a080e91bc-1706720826742
173+
[executable_block:615d3732-2464-4b0c-a22f-0a1a080e91bc-1706720826742][type:generic] = [executables:]
168174
restartbackgroundanimations = true
169175
loopbackgroundanimations = true
170176
nine_slice_custom_background = false
171177
nine_slice_border_x = 5
172178
nine_slice_border_y = 5
173179
navigatable = true
174180
element_type = vanilla_button
175-
instance_identifier = progress_bar
176-
appearance_delay = no_delay
177-
appearance_delay_seconds = 1.0
178-
fade_in = false
179-
fade_in_speed = 1.0
180-
anchor_point = vanilla
181-
x = 140
182-
y = 294
183-
width = 360
184-
height = 10
181+
instance_identifier = mojang_logo
182+
appearance_delay = every_time
183+
appearance_delay_seconds = 0.0
184+
fade_in = true
185+
fade_in_speed = 1.5
186+
anchor_point = mid-centered
187+
x = -142
188+
y = -35
189+
width = 285
190+
height = 70
185191
stretch_x = false
186192
stretch_y = false
187193
stay_on_screen = true
188-
element_loading_requirement_container_identifier = dfad7cf3-dc8a-4dca-8e31-68a6f09bd6a4-1706720826742
189-
[loading_requirement_container_meta:dfad7cf3-dc8a-4dca-8e31-68a6f09bd6a4-1706720826742] = [groups:][instances:]
190-
is_hidden = true
194+
element_loading_requirement_container_identifier = 3393f009-f8b5-46f1-ab18-58fd52e8fc38-1706720826742
195+
[loading_requirement_container_meta:3393f009-f8b5-46f1-ab18-58fd52e8fc38-1706720826742] = [groups:][instances:]
196+
is_hidden = false
191197
automated_button_clicks = 0
192198
nine_slice_slider_handle = false
193199
nine_slice_slider_handle_border_x = 5

season_6/config/fancymenu/customization/credits.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ type = fancymenu_layout
33
layout-meta {
44
identifier = credits
55
render_custom_elements_behind_vanilla = false
6-
last_edited_time = 1735683251126
6+
last_edited_time = 1742789714906
77
is_enabled = true
88
randommode = false
99
randomgroup = 1
1010
randomonlyfirsttime = false
1111
layout_index = 0
12-
[loading_requirement_container_meta:5adb9cfc-8cb1-4cfe-b8f0-298b6d16c4a3-1735683199628] = [groups:][instances:]
12+
[loading_requirement_container_meta:e4464454-304c-4dd5-9b02-0f9669bb84ba-1742789345294] = [groups:][instances:]
13+
}
14+
15+
customization {
16+
action = setscale
17+
scale = 3.0
1318
}
1419

1520
customization {
@@ -120,7 +125,7 @@ element {
120125

121126
element {
122127
interactable = true
123-
source = Canada_LaVearn%n%%#aaaaaa% Owner, Artist, Graphic Design%#%%n%%n%HerrKatzeGaming%n%%#aaaaaa% Lead Developer%#%%n%%n%MkeksikYT%n%%#aaaaaa% Developer%#%%n%%n%Mato539%n%%#aaaaaa% Developer, Artist, Modeler%#%%n%%n%Eliasthefox%n%%#aaaaaa% Artist, Modeler%#%%n%%n%Choconeosome%n%%#aaaaaa% Musician, Structure Design%#%
128+
source = Canada_LaVearn%n%%#aaaaaa% Owner, Artist, Graphic Design%#%%n%%n%HerrKatzeGaming%n%%#aaaaaa% Lead Developer%#%%n%%n%MkeksikYT%n%%#aaaaaa% Developer%#%%n%%n%Mato539%n%%#aaaaaa% Developer, Artist, Modeler%#%%n%%n%Eliasthefox%n%%#aaaaaa% Artist, Modeler%#%%n%%n%Choconeosome%n%%#aaaaaa% Musician, Structure Design%#%%n%%n%Tizu%n%%#aaaaaa% Developer%#%
124129
source_mode = direct
125130
shadow = true
126131
scale = 1.0
@@ -151,8 +156,8 @@ element {
151156
anchor_point = mid-left
152157
x = 30
153158
y = -73
154-
width = 200
155-
height = 190
159+
width = 236
160+
height = 229
156161
stretch_x = false
157162
stretch_y = false
158163
stay_on_screen = true
@@ -296,7 +301,7 @@ element {
296301

297302
element {
298303
interactable = true
299-
source = |||%n%Viriss%n%|||
304+
source = |||%n%Caljam%n%|||
300305
source_mode = direct
301306
shadow = true
302307
scale = 1.0
@@ -380,7 +385,7 @@ element {
380385

381386
element {
382387
interactable = true
383-
source = |||%n%NbeeMC%n%%#aaaaaa% Create-ive Cogs logo%#%%n%%n%%#00aaaa%Bisecthosting%#%%n%%#aaaaaa% Server provider, partnership%#%%n%%n%Players like you!%n%%#aaaaaa% for supporting us through feedback, gameplay, and more!%#%%n%|||
388+
source = |||%n%NbeeMC%n%%#aaaaaa% Create-ive Cogs logo%#%%n%%n%%#A9D18B%Lilypad%#%%n%%#aaaaaa% Server provider%#%%n%%n%Players like you!%n%%#aaaaaa% for supporting us through feedback, gameplay, and more!%#%%n%|||
384389
source_mode = direct
385390
shadow = true
386391
scale = 1.0

season_6/config/fancymenu/customization/s6alpha.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ layout-meta {
99
randomgroup = 1
1010
randomonlyfirsttime = false
1111
layout_index = 0
12-
[loading_requirement_container_meta:345a69af-b976-4e16-a8b5-9e354887b6b7-1720805885017] = [groups:][instances:]
12+
[loading_requirement_container_meta:1eb05f13-d0d5-40d2-811b-a81e32dad8e7-1742790064837] = [groups:][instances:]
1313
}
1414

1515
customization {

0 commit comments

Comments
 (0)