Skip to content

Commit cdfa5fe

Browse files
committed
v1.0.18
1 parent 175a0e1 commit cdfa5fe

File tree

130 files changed

+7974
-2110
lines changed

Some content is hidden

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

130 files changed

+7974
-2110
lines changed

Cargo.toml

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rebels"
3-
version = "1.0.17"
3+
version = "1.0.18"
44
edition = "2021"
55

66
[profile.release]
@@ -16,10 +16,10 @@ opt-level = 1
1616
opt-level = 3
1717

1818
[dependencies]
19-
anyhow = "1.0.86"
20-
async-trait = "0.1.82"
19+
anyhow = "1.0.89"
20+
async-trait = "0.1.83"
2121
chrono = "0.4.38"
22-
clap = { version = "4.5.16", features = ["derive"] }
22+
clap = { version = "4.5.19", features = ["derive"] }
2323
crossterm = "0.28.1"
2424
directories = "5.0.1"
2525
ed25519-dalek = "2.1.1"
@@ -28,7 +28,7 @@ gif = "0.13.1"
2828
image = "0.25.2"
2929
imageproc = "0.25.0"
3030
include_dir = "0.7.4"
31-
itertools = "0.11.0"
31+
itertools = "0.13.0"
3232
libp2p = { version = "0.52.4", features = [
3333
"noise",
3434
"ping",
@@ -42,24 +42,25 @@ libp2p = { version = "0.52.4", features = [
4242
] }
4343
log = "0.4.22"
4444
log4rs = { version = "1.3.0", features = ["file_appender", "pattern_encoder"] }
45-
once_cell = "1.19.0"
45+
once_cell = "1.20.1"
4646
rand = "0.8.5"
4747
rand_chacha = "0.3.1"
4848
rand_distr = "0.4.3"
49-
ratatui = { version = "0.28.1", features = ["all-widgets"] }
49+
ratatui = { git = "https://github.com/ratatui/ratatui", features = ["unstable-backend-writer"] }
5050
rodio = "0.19.0"
5151
russh = "0.45.0"
52-
russh-keys = "0.43.0"
53-
serde = { version = "1.0.209", features = ["derive", "default"] }
54-
serde_json = "1.0.127"
52+
russh-keys = "0.45.0"
53+
serde = { version = "1.0.210", features = ["derive", "default"] }
54+
serde_json = "1.0.128"
5555
serde_repr = "0.1.19"
5656
sha2 = "0.10.8"
57-
stream-download = { version = "0.7.3", features = ["reqwest-rustls"] }
57+
stream-download = { version = "0.9.0", features = ["reqwest-rustls"] }
5858
strum = { version = "0.26.3", features = ["derive"] }
5959
strum_macros = "0.26.4"
6060
tokio = { version = "1.40.0", features = ["full"] }
61-
tui-textarea = "0.6.1"
62-
unicode-width = "0.1.11"
61+
tokio-util = "0.7.12"
62+
tui-textarea = {git= "https://github.com/ricott1/tui-textarea" }
63+
unicode-width = "0.2.0"
6364
url = "2.5.2"
6465
uuid = { version = "1.10.0", features = ["v4", "serde"] }
6566
void = "1.0.2"

README.md

+3-1

assets/data/planets_data.json

+17-8
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
"name": "Proxima d",
8989
"populations": {
9090
"2": 6,
91-
"3": 5
91+
"3": 5,
92+
"100": 1
9293
},
9394
"resources": {
9495
"1": 1,
@@ -132,7 +133,7 @@
132133
"peer_id": null,
133134
"version": 0,
134135
"name": "Mizu",
135-
"populations": {"6": 16},
136+
"populations": {"6": 16, "103": 1},
136137
"resources": {
137138
"1": 4,
138139
"2": 3,
@@ -186,8 +187,10 @@
186187
"version": 0,
187188
"name": "Mars",
188189
"populations": {
189-
"2": 9,
190+
"2": 8,
190191
"102": 3,
192+
"104": 1,
193+
"105": 1,
191194
"109": 1
192195
},
193196
"resources": {
@@ -210,7 +213,7 @@
210213
"peer_id": null,
211214
"version": 0,
212215
"name": "Jupiter",
213-
"populations": { "1": 11, "109": 1 },
216+
"populations": { "1": 8, "106": 1 ,"107": 1 ,"109": 1 },
214217
"resources": {
215218
"1": 1,
216219
"2": 7,
@@ -234,7 +237,8 @@
234237
"populations": {
235238
"1": 6,
236239
"3": 3,
237-
"102": 2
240+
"102": 2,
241+
"104": 2
238242
},
239243
"resources": {
240244
"1": 2,
@@ -256,7 +260,7 @@
256260
"peer_id": null,
257261
"version": 0,
258262
"name": "Uranus",
259-
"populations": { "3": 9 },
263+
"populations": { "3": 9, "101": 1 },
260264
"resources": {
261265
"1": 2,
262266
"2": 6,
@@ -278,7 +282,10 @@
278282
"version": 0,
279283
"name": "Moon",
280284
"populations": {
281-
"101": 6,
285+
"101": 5,
286+
"102": 3,
287+
"103": 2,
288+
"106": 1,
282289
"1": 5,
283290
"5": 3
284291
},
@@ -305,6 +312,7 @@
305312
"populations": {
306313
"107": 2,
307314
"108": 2,
315+
"109": 1,
308316
"2": 4,
309317
"5": 1
310318
},
@@ -331,7 +339,8 @@
331339
"populations": {
332340
"1": 1,
333341
"2": 7,
334-
"5": 1
342+
"5": 1,
343+
"102": 1
335344
},
336345
"resources": {
337346
"2": 2,

assets/data/stream_data.json

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
"name": "Radio Frittura",
44
"url_string": "https://radio.frittura.org/rebels.ogg"
55
},
6+
{
7+
"name": "Party Frittura",
8+
"url_string": "https://radio.frittura.org/party.ogg"
9+
},
10+
{
11+
"name": "LPAS Frittura",
12+
"url_string": "https://radio.frittura.org/lpas.ogg"
13+
},
614
{
715
"name": "Matt Johnson radio",
816
"url_string": "https://us2.internet-radio.com/proxy/mattjohnsonradio?mp=/stream"

assets/engine/jester_double.png

-1 Bytes

assets/engine/jester_quadruple.png

-10 Bytes

assets/engine/pincher_double.png

0 Bytes

assets/engine/pincher_single.png

-1 Bytes

assets/engine/pincher_triple.png

-2 Bytes

assets/game/away_close_shot_mask.png

185 Bytes
319 Bytes

assets/game/away_long_shot_mask.png

330 Bytes

assets/game/away_medium_shot_mask.png

315 Bytes

assets/game/home_close_shot_mask.png

184 Bytes
313 Bytes

assets/game/home_long_shot_mask.png

343 Bytes

assets/game/home_medium_shot_mask.png

318 Bytes

assets/game/left_shot.gif

14.7 KB

assets/game/pitch_ball.png

679 Bytes

assets/game/pitch_classic.png

594 Bytes

assets/game/right_shot.gif

14.6 KB

assets/game/spinning_ball.gif

62.5 KB

assets/hull/jester_standard.png

-32 Bytes

assets/hull/mask_jester_standard.png

-17 Bytes

assets/hull/mask_pincher_large.png

-21 Bytes

assets/hull/mask_pincher_standard.png

-14 Bytes

assets/hull/pincher_large.png

-9 Bytes

assets/hull/pincher_standard.png

-28 Bytes

assets/shirt/pirategald0.png

171 Bytes

assets/shirt/pirategald10.png

180 Bytes

assets/shirt/pirategald12.png

181 Bytes

assets/shirt/pirategald3.png

173 Bytes

assets/shirt/pirategald5.png

174 Bytes

assets/shirt/pirategald7.png

178 Bytes

assets/shorts/pirategald0.png

166 Bytes

assets/shorts/pirategald10.png

172 Bytes

assets/shorts/pirategald3.png

174 Bytes

assets/shorts/pirategald7.png

170 Bytes

assets/shorts/pirategald9.png

176 Bytes
223 Bytes
215 Bytes
266 Bytes
123 Bytes
131 Bytes
136 Bytes
146 Bytes
170 Bytes
170 Bytes

0 commit comments

Comments
 (0)