Commit Graph

30264 Commits

Author SHA1 Message Date
Ed
a2cd7754f7 Update Dev.toml 2025-02-04 19:40:21 +03:00
Ed
d1cb8584bc Update Dev.toml 2025-02-04 19:37:35 +03:00
Ed
344d99dabb hunger damage experiment 2025-02-03 17:36:56 +03:00
Ed
3227459231 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-02-03 17:36:23 +03:00
Ed
478b927e2b copper prices fix 2025-02-03 17:32:47 +03:00
Ed
4aea4b853c Minor procedural fixes pack (#837)
* demiplanE

* Update EntityTest.cs

* Update DungeonSystem.Rooms.cs

* Update EntityTest.cs
2025-02-03 17:09:09 +03:00
Ed
c0275238ac Update CP14DemiplaneGeneratorDataComponent.cs 2025-02-02 15:30:34 +03:00
Ed
3437830a78 admin demiplanes catcher (#835) 2025-02-02 15:24:34 +03:00
Ed
445fd1e1b9 Update CP14ModularCraftPartPrototype.cs 2025-02-02 13:23:57 +03:00
Ed
b2a20da722 some sprite patch 2025-02-02 13:07:50 +03:00
Ed
a6262a471d Resprites + Satchels (#834)
* magic essence experiment

* demiplane key resprite

* some resprites

* guard commander cape

* vat and cauldron resprite

* flint resprite

* satchels!
2025-02-02 03:29:55 +03:00
Ed
8e1d310a8e Guildmaster YML implementation + Clothing pack (#832)
* banker clothing resprite

* dinazewwr

* commandant cape resprite

* guildmaster cloak

* Guildmaster loadout

* guildmaster job icon

* key locks work

* map update

* guildmaster keys

* guildmaster stamp

* update guildmaster house

* track demiplanes

* player death track

* localization

* guildmaster objective

* Update empire_orders.yml

* fix

* fix map
2025-02-01 17:52:01 +03:00
Ed
ca2e378c8a Update furnace.yml 2025-01-31 18:40:49 +03:00
Ed
3f70d8600c Fixes (#824)
* delete round seed

* delete worldEdge locale

* Update CP14BiomeSpawnerSystem.cs

* nails to 50 max stack

* wood planks stack increase

* flora material stack edit

* Update EntityTest.cs

* Update EntityTest.cs
2025-01-31 18:24:54 +03:00
Ed
b3eed32588 Workbench Refactor (#826)
* Workbench refactor

* fixes

* update all recipes protos

* scrap resprite

* scrap melting

* scrap weapon drop

* demiplane loot update

* weapon parts melting

* fix

* boilerplate

* material localization
2025-01-31 14:47:51 +03:00
github-actions[bot]
d2dd818b33 @KittenColony has signed the CLA in crystallpunk-14/crystall-punk-14#827 2025-01-31 01:19:14 +00:00
Ed
176267ef7b OOC Relay experiment (#821) 2025-01-30 15:42:03 +03:00
Ed
8c42cdbbdf Stackable ore (#820)
* ore stacks

* Update ores.yml
2025-01-30 13:48:42 +03:00
Ed
2383bfdf08 fix roles folders 2025-01-29 21:23:28 +03:00
Ed
0546a08087 Update mobs.yml 2025-01-29 21:10:28 +03:00
Ed
af2466f0fa Update mobs.yml 2025-01-29 17:47:09 +03:00
Nim
0463798b33 fix (#818) 2025-01-29 17:17:35 +03:00
Ed
ad9813cace ice caves demiplane (#817)
* ice caves demiplane

* more things can spawn on snow

* Update base.yml

* fix guidebook quartz

* ice island demiplane

* xeno turret demiplane mobs
2025-01-29 00:48:11 +03:00
Ed
63e03ae7af unique quartz energy crystals 2025-01-28 20:29:50 +03:00
Ed
2bb465cb8b Different crystals type update (#816)
* crystals update

* fixes

* fixes

* hehehe
2025-01-28 18:05:15 +03:00
Ed
42627a0c33 Random content (#815)
* demiplane crystal sprite update

* fix demiplane astral haze vanilla

* fix infinity money stacking

* rabbits outbreak!

* fix meta

* fix rga

* fix CLRF

* move subterranean leap action to actions folder

* Update audio.yml

* Update natural.yml

* restore lzk commit

* fix endscreen text

* fix goblin displacement, fix #809

* Update kudzu.yml
2025-01-28 13:04:10 +03:00
Ed
d3a5d232ac Update blacksmith.yml 2025-01-27 18:42:44 +03:00
Ed
af182db79e Another assets relicense (#814)
* TheShuEd assets relicensing

* Max Gab mass relicensing

* omsoyk mass relicensing

* Prazat mass relicense

* Jaraten mass relicensing

* Update meta.json

* jaraten part 2

* finalize

* validation

* unrelated fixes

* Revert "jaraten part 2"

This reverts commit b39ee0cdb9.

* Revert "Jaraten mass relicensing"

This reverts commit 44febae380.

* Revert "validation"

This reverts commit 3d2f388f47.

* Revert "finalize"

This reverts commit 775f21a18d.

* final fix
2025-01-27 16:03:13 +03:00
Ed
0e6082cd9f spells mini tweak 2025-01-26 21:11:13 +03:00
github-actions[bot]
b92de3d768 @TheShuEd has signed the CLA in crystallpunk-14/crystall-punk-14#734 2025-01-26 14:43:02 +00:00
github-actions[bot]
d549098641 @Nimfar11 has signed the CLA in crystallpunk-14/crystall-punk-14#813 2025-01-26 14:14:04 +00:00
Ed
011104816a Update cla.yml 2025-01-26 16:21:02 +03:00
Ed
00eedea77e Update cla.yml 2025-01-26 16:14:12 +03:00
Ed
a9a2372ba8 Update cla.json 2025-01-26 16:09:39 +03:00
Ed
14930094d7 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-01-26 16:05:23 +03:00
Ed
b0189002e8 Update cla.yml 2025-01-26 16:04:48 +03:00
Ed
c670b79fd0 Update guildmaster.yml (#810) 2025-01-26 15:57:44 +03:00
github-actions[bot]
d43b67c6d4 @TheShuEd has signed the CLA in crystallpunk-14/crystall-punk-14#810 2025-01-26 12:54:43 +00:00
github-actions[bot]
58db8c4699 Creating file for storing CLA Signatures 2025-01-26 12:53:32 +00:00
Ed
12edd8f023 Create cla.yml 2025-01-26 15:49:12 +03:00
Ed
852e19601a license part 2 2025-01-26 15:34:52 +03:00
Ed
e5c8256cfa license part 1 2025-01-26 15:33:18 +03:00
Ed
2201bb70dd end OBT 2025-01-26 00:10:08 +03:00
Ed
72279cee6b english OBT 2025-01-25 19:51:24 +03:00
Ed
f2bfeefcae Guildmaster + Comoss update (#808)
* setup guildmaster job

* divide artisans and adventurer departments

* comoss tavern update

* Update comoss.yml
2025-01-25 17:47:17 +03:00
Nim
918c7d1e3b Pies (#794)
* pie

* qwe

* recipe

* Solution

* dough

* some tweaks

* fix crafting bugs

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-01-25 14:40:16 +03:00
Ed
65faa9ae63 fix ice wall sprite 2025-01-25 02:43:16 +03:00
Ed
62658f5017 ice block window 2025-01-25 01:40:05 +03:00
Ed
2de94ea8b2 Update SharedProjectileSystem.cs 2025-01-24 23:18:26 +03:00
Ed
2ee1716a85 fix role restriction 2025-01-24 22:43:04 +03:00