Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync #280

Merged
merged 71 commits into from
Nov 19, 2023
Merged

sync #280

merged 71 commits into from
Nov 19, 2023

Conversation

Azzyypaaras
Copy link
Collaborator

No description provided.

DaFuqs and others added 30 commits November 6, 2023 21:24
@DaFuqs
monstrosity head not required anymore for mob head collection advance…
7f84cb1 
…ment
@DaFuqs
Merge remote-tracking branch 'origin/1.19-deeper-down' into 1.19-deep…
47b19b5 
…er-down
@DaFuqs
dd portal teleport only destroys natural dd blocks, not other (probab…
ab7ae77 
…ly player placed) ones
@DaFuqs
update fabric
e600fce
@DaFuqs
unlock for titration honey recipe (Eset)
4b3f4aa
@DaFuqs
fixed z-fighting in potion workshop (Noaaan)
efb365e
@DaFuqs
cap spawner detection upgrade range at 64
53f0eac
@DaFuqs
better fitting potion workshop outline
6aa550b
@Azzyypaaras
Primordial fire now works as originally planned + Kindlings now brawl
91bdf87
@Azzyypaaras
Further kindling play tweaks
e594f15
@DaFuqs
Merge remote-tracking branch 'origin/1.19-deeper-down' into 1.19-deep…
85f342f 
…er-down
@DaFuqs
tweaked primordial fire damage calculation
2480527
@DaFuqs
command formatting
2d12bfa
@DaFuqs
command to set entities on primordial fire
a06cb4b
@DaFuqs
fixed kindling anims when riding & improved kindling loving
6e09210
@DaFuqs
added missing config tooltip
1234ebe
@DaFuqs
anvil config setting only applies when enchanting items, not combinin…
381f098 
…g books
@DaFuqs
fixed disenchanting enchanted books in midnight solution resulting in…
efabb05 
… enchanted books without enchants
@DaFuqs
yes
1641525
@DaFuqs
probably fix #272. Buw who knows, really
f9badf0
@DaFuqs
simplified disenchanting code
0c9fb69
@DaFuqs
move everything that can be eaten into the cuisine guidebook category
69290fa
@DaFuqs
fix dragonrot converting guidebook page type background
7fceeaf
@DaFuqs
add "mud converting" guidebook page type. Update guidebook
1600eee
@DaFuqs
simplified bident code
26fc46d
@DaFuqs
lowered default angels share to not be as brutal in dry biomes
2f19ca4
@DaFuqs
lots of small improvements all around
a755580
@DaFuqs
add pipe bombs as loot
a06a8f6
@DaFuqs
rework the modular explosives guidebook entry
fe8230e
@DaFuqs
modular explosive improvements
e608499
DaFuqs and others added 29 commits November 15, 2023 18:43
@DaFuqs
made color picker more quiet
2fd5f93
@DaFuqs
made color picker more quiet
f271f7e
@DaFuqs
increased threat conflux yield
c9f159c
@DaFuqs
made dd cities a tad larger
188085c
@DaFuqs
pipe bombs
84d7963
@DaFuqs
Merge remote-tracking branch 'origin/1.19-deeper-down' into 1.19-deep…
bb46334 
…er-down
@Noaaan
reimplement direct damage interface
b0a9530 
Signed-off-by: Noaaan <noaaan@hotmail.com>
@Noaaan
Merge remote-tracking branch 'origin/1.19-deeper-down' into 1.19-deep…
d580539 
…er-down
@DaFuqs
made sure empty resonance drops don't mess with others
c93784d
@DaFuqs
cleaned up spawner resonance drop
3088927
@DaFuqs
unlock a bit more optional stuff on upgrade
28116a9
@DaFuqs
Merge remote-tracking branch 'origin/1.19-deeper-down' into 1.19-deep…
2524a8f 
…er-down
@DaFuqs
make jadeite placeable on stone
e5b59dc
@DaFuqs
baby kindlings are smol
651c0e9
@DaFuqs
not THAT smol
1c2d273
@DaFuqs
fixed kindling crash
0b3b9bd
@DaFuqs
fixed missing DD city porches. At a price.
9c4f101
@Azzyypaaras
Reworked primordial fire effect as previously planned. Nerfed Primord…
4fd0bb8 
…ialFireBlock's damage a bit.

Additionally, added a tag for PF immunity.
@DaFuqs
removed secret flags on unlockable guidebook entries
ef7b1bd
@DaFuqs
stripped wood common tag
b1b9496
@DaFuqs
updated Remembrance staff guidebook entry (maxgamer134)
9b1c9fa
@DaFuqs
update archive name
0a797d5
@DaFuqs
removed underground air from terrace_houses_base
c3b8ef0
@DaFuqs
fixed quitoxic reeds not always consuming clay
072a6fe
@DaFuqs
netherite_crap_crap
af51dc8
@DaFuqs
exploding blocks keeps the fluids
4e29bc9
@DaFuqs
fixed crafting tablet crash when not having progression (Noaaan)
80e8566
@DaFuqs
decay will not consume any blocks without hitbox like radiance staff …
e337a04 
…lights (ThatGuyCalledMyth)
@DaFuqs
reworked GravitableItems to scale linearly. Simplified code
c26bf40
@Azzyypaaras Azzyypaaras merged commit d6bcc5f into great-resprite Nov 19, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Azzyypaaras @DaFuqs @Noaaan