Commit Graph

168 Commits

Author SHA1 Message Date
Robert MacRae
b5e39f2506 fixed missing lang arguments 2026-04-03 11:32:51 -03:00
Robert MacRae
58637a7c00 fixed "titianium" and bio pulp 2026-04-03 11:01:26 -03:00
Robert MacRae
6bcaadbfae fixed dimentional crystal 2026-04-03 00:36:09 -03:00
Robert MacRae
de990bc30d fixed more naming 2026-04-03 00:30:52 -03:00
Robert MacRae
6eae4b5f54 fixed broken reference 2026-04-03 00:29:04 -03:00
Robert MacRae
f98a5aadc1 uploaded derpus textures 2026-04-03 00:25:36 -03:00
Robert MacRae
de8f4043d3 Fixed some naming issues 2026-04-02 23:56:10 -03:00
cowcannon
f44a93e114 Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-04-02 20:41:58 -05:00
cowcannon
da8dc5113e personal and ship equipment name organization
modified:   game-server/datapacks/original/assets/languages/en_US.json
	modified:   game-server/datapacks/original/assets/languages/fr_FR.json
	modified:   game-server/datapacks/original/assets/languages/uk_UA.json
	modified:   game-server/datapacks/original/data/items/equipment/personal/accessory/basic_accessory.json
	modified:   game-server/datapacks/original/data/items/equipment/personal/backpack/backpack_basic.json
	modified:   game-server/datapacks/original/data/items/equipment/personal/boots/basic_boots.json
	modified:   game-server/datapacks/original/data/items/equipment/personal/gloves/basic_gloves.json
	modified:   game-server/datapacks/original/data/items/equipment/personal/suit/basic_suit.json
	modified:   game-server/datapacks/original/data/items/equipment/personal/weapns/basic_weapon.json
	modified:   game-server/datapacks/original/data/items/equipment/ship/engines/basic_ship_engines.json
	modified:   game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json
	modified:   game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json
	modified:   game-server/datapacks/original/data/items/equipment/ship/thrusters/basic_ship_thrusters.json
	modified:   game-server/datapacks/original/data/items/equipment/ship/weapons/basic_ship_weapon.json
	new file:   game-server/datapacks/original/data/items/equipment/ship/weapons/unstable_partical_cannon.json
2026-04-02 20:31:52 -05:00
MaksSlyzar
b379a2a98c Added online for contacts. Updated chat 2026-04-03 03:56:14 +03:00
cowcannon
5929303523 image filename fixes 2026-04-02 18:24:27 -05:00
cowcannon
c131e9d6be lang fixes
modified:   game-server/datapacks/original/assets/languages/en_US.json
	modified:   game-server/datapacks/original/assets/languages/fr_FR.json
	modified:   game-server/datapacks/original/assets/languages/uk_UA.json
	renamed:    game-server/datapacks/original/data/items/materials/crystals/crystal._void.json -> game-server/datapacks/original/data/items/materials/crystals/crystal_void.json
	renamed:    game-server/datapacks/original/data/recipes/alloys/voidsteel.json -> game-server/datapacks/original/data/recipes/alloys/void_steel.json
2026-04-02 18:09:11 -05:00
cowcannon
62944d041c Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-04-02 18:00:19 -05:00
cowcannon
0012da898d lang file update
modified:   game-server/datapacks/original/assets/languages/en_US.json
	modified:   game-server/datapacks/original/assets/languages/fr_FR.json
	modified:   game-server/datapacks/original/assets/languages/uk_UA.json
	new file:   game-server/datapacks/original/data/items/materials/alloys/superconductor.json
2026-04-02 17:59:35 -05:00
MaksSlyzar
f15486fd62 Fixed User model 2026-04-03 01:40:44 +03:00
MaksSlyzar
292b21d203 Update title 2026-04-03 01:34:56 +03:00
MaksSlyzar
9fcc6e0cb6 Fixed game server playersOnline. 2026-04-03 01:26:48 +03:00
MaksSlyzar
d245eebac1 Added remove. Updated friend list. Fixed friend accept notification. 2026-04-03 01:25:20 +03:00
MaksSlyzar
69f5523454 Added SocialManager, Updated Chat. 2026-04-02 22:41:25 +03:00
MaksSlyzar
1de6fc980d Added AdminManager. Updated NotificationManager 2026-04-02 22:28:06 +03:00
Robert MacRae
2c61c8c05c added derus textures and fixed naming 2026-04-02 10:27:49 -03:00
Robert MacRae
7ab64992a4 Fixed the stats system for the hostiles 2026-04-02 10:07:38 -03:00
cowcannon
fea891678e Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-04-01 20:48:21 -05:00
cowcannon
e4cefded47 more alloys and crystals
modified:   game-server/datapacks/original/assets/languages/en_US.json
	new file:   game-server/datapacks/original/data/items/materials/alloys/neutronium_composite.json
	new file:   game-server/datapacks/original/data/items/materials/crystals/dimentional_crystal.json
	renamed:    game-server/datapacks/original/data/items/materials/crystals/flux crystal.json -> game-server/datapacks/original/data/items/materials/crystals/flux_crystal.json
	new file:   game-server/datapacks/original/data/items/materials/crystals/neutronium.json
	new file:   game-server/datapacks/original/data/recipes/Crystals/dimentional_crystal.json
	modified:   game-server/datapacks/original/data/recipes/Crystals/flux_core.json
	new file:   game-server/datapacks/original/data/recipes/alloys/neutronium_composite.json
2026-04-01 20:47:52 -05:00
MaksSlyzar
552d664eb2 added server status indicator and added server status logic 2026-04-02 03:59:54 +03:00
MaksSlyzar
15c312729e fix .env files 2026-04-01 20:43:07 +03:00
MaksSlyzar
d826f98308 update readme.md 2026-04-01 17:00:29 +03:00
MaksSlyzar
9704af5115 update readme.md 2026-04-01 16:59:39 +03:00
Robert MacRae
8306d1bafd fixed the chronotanium recipe 2026-03-31 21:13:50 -03:00
Robert MacRae
2488316e90 added back steel ingot crafting 2026-03-31 21:13:36 -03:00
Robert MacRae
4ea4d5276b Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-03-31 21:09:28 -03:00
Robert MacRae
0a529688f0 removed old steel recipe 2026-03-31 21:09:17 -03:00
root
5f68544a95 nginx 2026-03-31 20:00:02 -04:00
Robert MacRae
a343681321 finished fixing textures 2026-03-31 20:12:37 -03:00
Robert MacRae
fd0e23b299 Fixing images 2026-03-31 20:11:16 -03:00
MaksSlyzar
eae2b912a1 Trigger deploy with new secrets 2026-04-01 01:35:04 +03:00
MaksSlyzar
53a701c53f Trigger deploy with new secrets 2026-04-01 01:32:26 +03:00
MaksSlyzar
91dbf17c6c Trigger deploy with new secrets 2026-04-01 01:25:50 +03:00
MaksSlyzar
e97ae9e5b5 Trigger deploy with new secrets 2026-04-01 01:20:41 +03:00
MaksSlyzar
ae0b768ee4 deploy 2026-04-01 01:18:28 +03:00
MaksSlyzar
02c8e75f24 Setup Github auto-deploy 2026-04-01 01:12:22 +03:00
MaksSlyzar
4ad756f4d9 fix import 2026-04-01 00:37:03 +03:00
MaksSlyzar
386b0a37e4 Merge branch 'main' of github.com:Korvarix/Galaxy-Strike-Online 2026-04-01 00:24:36 +03:00
MaksSlyzar
42ae328b56 added inventory manager and .env for the client 2026-04-01 00:23:42 +03:00
Robert MacRae
cd24b7527f fixed the naming 2026-03-31 18:18:27 -03:00
MaksSlyzar
7302a54cd7 small datapack fix 2026-03-31 15:49:23 +03:00
MaksSlyzar
91a49a33cd fix api heartbeat 2026-03-31 15:26:34 +03:00
cowcannon
b1719978a7 crystals and more alloys
new file:   game-server/datapacks/original/data/items/materials/crystals/flux_core.json
	new file:   game-server/datapacks/original/data/recipes/Crystals/flux_core.json
	new file:   game-server/datapacks/original/data/recipes/alloys/superconductor.json
	renamed:    game-server/datapacks/original/data/recipes/alloys/titianium_weave.json -> game-server/datapacks/original/data/recipes/alloys/titanium_weave.json
2026-03-30 21:35:37 -05:00
cowcannon
270a5fcccf started alloys and reqequired resources. updated skill lvls for already implemtened items
modified:   game-server/datapacks/original/assets/languages/en_US.json
	modified:   game-server/datapacks/original/assets/languages/fr_FR.json
	modified:   game-server/datapacks/original/assets/languages/uk_UA.json
	new file:   game-server/datapacks/original/data/items/materials/alloys/chronotanium.json
	new file:   game-server/datapacks/original/data/items/materials/alloys/titianium_weave.json
	new file:   game-server/datapacks/original/data/items/materials/alloys/void_steel.json
	new file:   game-server/datapacks/original/data/items/materials/crystals/flux crystal.json
	new file:   game-server/datapacks/original/data/items/materials/crystals/void crystal.json
	new file:   game-server/datapacks/original/data/items/materials/ingots/carbon.json
	new file:   game-server/datapacks/original/data/recipes/alloys/chronotanium.json
	modified:   game-server/datapacks/original/data/recipes/alloys/steel.json
	new file:   game-server/datapacks/original/data/recipes/alloys/titianium_weave.json
	new file:   game-server/datapacks/original/data/recipes/alloys/voidsteel.json
	modified:   game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json
	modified:   game-server/datapacks/original/data/recipes/circuits/ai_core.json
	modified:   game-server/datapacks/original/data/recipes/circuits/basic_circuit.json
	modified:   game-server/datapacks/original/data/recipes/circuits/processing_circuit.json
	modified:   game-server/datapacks/original/data/recipes/circuits/quantum_processor.json
	modified:   game-server/datapacks/original/data/recipes/ingots/aluminum.json
	new file:   game-server/datapacks/original/data/recipes/ingots/carbon.json
	modified:   game-server/datapacks/original/data/recipes/ingots/copper.json
	modified:   game-server/datapacks/original/data/recipes/ingots/iron.json
	modified:   game-server/datapacks/original/data/skills/crafting/circuit_assembly.json
	modified:   game-server/datapacks/original/manifest.json
2026-03-30 18:02:54 -05:00
cowcannon
588e191f5e fixed typos in lang files on wolframite 2026-03-30 13:13:06 -05:00