Commit Graph

100 Commits

Author SHA1 Message Date
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
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
15c312729e fix .env files 2026-04-01 20:43:07 +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
02c8e75f24 Setup Github auto-deploy 2026-04-01 01:12:22 +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
cowcannon
336dbb0d6f added circuits and their descriptions to the lang files
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
2026-03-30 13:04:45 -05:00
Your Name
2089ae2b72 Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-03-30 10:37:12 -05:00
Robert MacRae
76d4ac9beb some basic equipment 2026-03-29 20:16:24 -03:00
Robert MacRae
646faac403 re-organized the items + new items 2026-03-29 19:56:39 -03:00
Robert MacRae
cd0f885384 fixes and new combat ones 2026-03-29 19:14:50 -03:00
Robert MacRae
538608f939 changed input -> progressionCurve 2026-03-29 19:10:05 -03:00
Your Name
bb8192697b Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-03-29 14:21:28 -05:00
Robert MacRae
f615036808 I think clean-up 2026-03-29 14:16:30 -03:00
Robert MacRae
0bdc3b7cf0 added ground architecture for admin panel 2026-03-29 11:03:04 -03:00
Robert MacRae
8b6d9fa145 fixed the tutorial lang setup 2026-03-29 10:17:29 -03:00
Robert MacRae
db36fd6a43 Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online 2026-03-29 08:45:08 -03:00
Robert MacRae
e03d705809 new core_system category and shop tabs 2026-03-29 08:44:55 -03:00
MaksSlyzar
b655c3b304 db config update 2026-03-29 14:30:52 +03:00
Robert MacRae
3c8c3532ca new core systems and more shops 2026-03-29 08:20:55 -03:00
MaksSlyzar
6d49b93869 notifications, chat update 2026-03-29 14:14:54 +03:00
Robert MacRae
eff4d06fab naming convention fixing 2026-03-29 07:50:52 -03:00
Robert MacRae
c2de9d5a1c added more textures 2026-03-29 07:50:28 -03:00
MaksSlyzar
82836c2ef3 clear command fix 2026-03-29 11:08:10 +03:00
MaksSlyzar
f41eeb0e08 crafting system 2026-03-29 11:04:42 +03:00
MaksSlyzar
57a7accdd7 player manager, console update 2026-03-29 10:27:39 +03:00
Your Name
e9339f1cac circuits and the skill to make them added. also fixed spelling wolframite (tungston ore) 2026-03-29 01:51:03 -05:00
MaksSlyzar
a828a80a7e added settings, uk_UA langugage 2026-03-29 08:55:24 +03:00
Robert MacRae
3c11d27916 full re-write now ready for proper share 2026-03-29 00:16:10 -03:00