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.

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

Merge latest #1

Merged
merged 83 commits into from
Nov 25, 2022
Merged

Merge latest #1

merged 83 commits into from
Nov 25, 2022

Conversation

Talan122
Copy link
Owner

No description provided.

ALongStringOfNumbers and others added 30 commits January 29, 2022 18:06
- Fixes a crash with AE2 meteorite compass (skips bakedQuads with null
  faces)

- Update CensoredASM config file
  * Hopefully fixes AE2 terminals rendering weird on first launch
- Adds Lathe recipes for Gear -> Buzzsaw
Should hopefully help prevent merge issues in the future.

[skip ci]
Should make two casings, not one.
Removes Osmium dust smelting into ingots in the Furnace. This recipe was added by EnderIO, and was not intended.

To compensate, lowers the duration of the EBF recipe by a lot (628 seconds -> 20 seconds).

Closes #463 

[skip ci]
Makes the text consistently white and italic.

[skip ci]
Fixes multiple furnace recipes no longer giving experience
[skip ci]

Co-authored-by: NotMyWing <[email protected]>
- Remove Island Cake crafting recipe
- Configure Island Cake defaults for Dim 119 and to not require fuel
  * This should be useful defaults for server admins
Update MixinBooter from 2.0 to 4.2
Update CensoredASM from 4.6 to 4.7.1
NotMyWing and others added 29 commits June 30, 2022 09:48
Force backup on server stopped setting was causing a race condition in
certain circumstances that was interfering with the saving process,
resulting in loss of save data.

[skip ci]
* Remove Better Questing 3.5.329 and replace with Better Questing Unofficial 4.0.2
* Remove Bansoukou patch targeting Better Questing 3.5.329
* Remove Better Questing Standard Expansion 3.4.173 (no longer needed)

Fixes #880 by adding missing dependencies to T8 Micro Miner quest
Fixes #641 by adding one Chorus Flower as a reward for the Telepad quest

Additional quest book fixes:
* Add GP Generation as prerequisite for Oil Drilling Rig
* Convert all fluid bucket item retrieval quests to fluid quests
* Link UV Circuits progression tab quest to Wetware Arrays
* Fix Pattern Terminal quest icon
* Switch line from Tritanium to T8 to appear on Hover
* Add quest for Extended Processing Pattern Terminal
* Fix pluralization on a circuit quest, order circuit quest prerequisites
* Switch line from Draconium to 2nd T7 Circuits to appear on hover
Remove Better Questing Quest Book

- Update BQu config file
- Change icon of progression tab to BQu's Quest Book item
- Update Custom Starting Gear config to give the BQu book instead
- Add Discord server status/invite link badge
- Add GHA build status badge

[skip ci]
Remove CraftingTweaks 8.1.9 and replace with dan's Crafting Tweaks 9.0.1
Accidentally changed the Reinforced Satchel recipe while addressing issue #879 in commit 6df363b.

This commit resolves the issue more cleanly and restores the prior recipe.

[skip ci]
For whatever reason the base recipe for making Glycerol using Canola
Oil had its quantities of each ingredient reversed relative to the
Glycerol recipes using Seed and Fish Oil.

This swaps the values to bring it back in line with the other recipes,
while still rewarding the player for refining the Canola Oil into
Refined, Crystallized, and Empowered forms.

[skip ci]
@Talan122 Talan122 merged commit 98a4799 into Talan122:dev Nov 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants