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

0.5.22 #3993

Merged
merged 424 commits into from
Jan 6, 2022
Merged

0.5.22 #3993

merged 424 commits into from
Jan 6, 2022

Conversation

NielsPilgaard
Copy link
Collaborator

No description provided.

MuteTiefling and others added 30 commits December 7, 2021 20:54
@MuteTiefling
Update mechanical_crafting.js
dfc8af1
@MuteTiefling
enchanting apparatus
2a90b89
@MuteTiefling
move everything out of better end pedestals
b5dc9d0
@MuteTiefling
Update enchanting_apparatus.js
9b970a3
@MuteTiefling
quest update
37e3657
@NielsPilgaard
Update update-and-start-server.sh
84b4031
@NielsPilgaard
Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 …
8d3e6a4 
…into develop
@NielsPilgaard
Merge pull request #3871 from MuteTiefling/infinity-and-beyond
582508e 
[Expert] Infinity Tools
@NielsPilgaard
most of our own tcon materials now accept fluid tags
609a128
@NielsPilgaard
TCon removes slime boots variants and added a more interesting recipe…
8c05491 
…, removed our overrides and changed loot entries to the only slime boots now available
@NielsPilgaard
Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 …
53927b5 
…into develop
@NielsPilgaard
added fluid tags for all our custom fluids
4567834
@NielsPilgaard
all our tcon materials now use fluid tags
7ada2a2
@NielsPilgaard
Update minecraftinstance.json
e6e257a
@MuteTiefling
Glyph updates
70d5c6c
@MuteTiefling
reduce animal spawner light required
84096ff
@MuteTiefling
revert light required. was fine if linked to world gen crystal
3b607cf
@MuteTiefling
back down!
b6bb078
@NielsPilgaard
Merge pull request #3873 from MuteTiefling/glyph-updates
047b59f 
[Expert] Glyph updates to give an easier path to silk touch
@MuteTiefling
tinkers
aec0bb8
@MuteTiefling
initial power values
50abfd7
@MuteTiefling
Update gear.toml
07f3aa2
@MuteTiefling
Update gear.toml
f5119d6
@MuteTiefling
Update gear.toml
761bd60
@MuteTiefling
meka suit
6ff4761
@DarkAngel22579
Removed tool material overlap
5cd794c
@DarkAngel22579
Removed quark buttons from the part builder
0a5ed27
@MuteTiefling
add colors to more ores in scannable
03857a0
@MuteTiefling
Update dissolution_chamber.js
9917a6d
@DarkAngel22579
Changed Gaia Spirit composite to accept Materialis Terrasteel in its …
c92cab7 
…recipe
NielsPilgaard and others added 26 commits January 5, 2022 11:45
@NielsPilgaard
Merge pull request #3966 from Rodg88/develop
f21caaa 
added quark cactus paste as a source of green dye
@NielsPilgaard
unpacking recipe for valhelsia structures bone pile block #3946
6924250
@NielsPilgaard
Merge branch 'develop' of https://github.com/EnigmaticaModpacks/Enigm…
ef23025 
…atica6 into develop
@NielsPilgaard
don't override these mekanism configs, they're handled by configswapper
1f7bcb4
@NielsPilgaard
ignore configswapper configs
5ccc397
@NielsPilgaard
Update randompatches.toml
9a78772
@NielsPilgaard
Update randompatches.toml
6c85c16
@NielsPilgaard
unignored configs, we need them since they have to be present before …
4e542c9 
…configswapper does its thing
@NielsPilgaard
Update .gitignore
289da6f
@NielsPilgaard
re-add mekanism configs
93bfbb1
@NielsPilgaard
removed and ignored configswapper configs. Hopefully this won't mess …
049423a 
…anything up 😅
@NielsPilgaard
Update minecraftinstance.json
40a53b2
@NielsPilgaard
re-added randompatches.toml config, woops
da3e9cc
@NielsPilgaard
actually fix #3946 - also fixed cut posts not being craftable
fbffaf7
@NielsPilgaard
Update .gitignore
ad29f44
@MuteTiefling
Reduce cost of logic director
fe0007a
@MuteTiefling
remove slime bucket
8b8b75d
@MuteTiefling
move base sacrificial bowl out of enchanting apparatus
85ba408
@MuteTiefling
Expand error message for multiblock gamestages
6e4779d
@MuteTiefling
Merge pull request #3986 from MuteTiefling/more-fixes
d855d3b 
[Expert] Minor Recipe Adjustments
@MuteTiefling
Separate Rock Path, Stone Bricks, and Polished Andesite crafting recipes
eca70f0 
Resolves #3953
@MuteTiefling
Merge pull request #3989 from MuteTiefling/develop
1540e7c 
Separate Rock Path, Stone Bricks, and Polished Andesite crafting recipes
@MuteTiefling
Add Crushing recipes for petcoke dust. Add Thermal Steel recipe using…
775a171 
… petcoke dust.

Resolves #3980
@MuteTiefling
Merge pull request #3990 from MuteTiefling/develop
d60426e 
Add Crushing recipes for petcoke dust. Add Thermal Steel recipe using petcoke dust.
@NielsPilgaard
this config changed a bit, updated
392ad16
@NielsPilgaard
added missing overrides field to manifest zip, reduced compression le…
26d6181 
…vel to default from fastest
@NielsPilgaard NielsPilgaard added the Development General development, using this on an issue will not add it to changelogs, as opposed to Enhancement label Jan 6, 2022
@NielsPilgaard NielsPilgaard merged commit 01bcfb5 into master Jan 6, 2022
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
Development General development, using this on an issue will not add it to changelogs, as opposed to Enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@NielsPilgaard @Darkere @MuteTiefling @DarkAngel22579 @RipleyHyena @landretk @Rodg88 @TemperedFool