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

Travellers Gear Removal - Should only be merged when the mod is removed #1115

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fe12d70
Travellers Gear Removal
Ethryan Dec 22, 2024
210c013
fix spelling error
Ethryan Dec 23, 2024
2ed707c
Merge branch 'master' into TG-Removal
Dream-Master Dec 24, 2024
8c62cd3
Merge branch 'master' into TG-Removal
Dream-Master Jan 8, 2025
e45430c
Merge branch 'master' into TG-Removal
Dream-Master Jan 9, 2025
960f06c
Merge branch 'master' into TG-Removal
Dream-Master Jan 10, 2025
da7fe97
Merge branch 'master' into TG-Removal
Dream-Master Jan 11, 2025
6c9a852
Merge branch 'master' into TG-Removal
Dream-Master Jan 11, 2025
673fa83
Merge branch 'master' into TG-Removal
serenibyss Jan 12, 2025
71dd6de
Merge branch 'master' into TG-Removal
Dream-Master Jan 26, 2025
0ce9917
Merge branch 'master' into TG-Removal
Dream-Master Jan 27, 2025
417eccb
Merge branch 'master' into TG-Removal
Dream-Master Feb 1, 2025
2d1e35b
Merge branch 'master' into TG-Removal
serenibyss Feb 7, 2025
f3a35c1
Merge branch 'master' into TG-Removal
Dream-Master Feb 10, 2025
1ce74f8
Merge branch 'master' into TG-Removal
Dream-Master Feb 12, 2025
3519677
Merge branch 'master' into TG-Removal
Dream-Master Feb 13, 2025
532c621
Merge branch 'master' into TG-Removal
Dream-Master Feb 13, 2025
31ff35f
Merge branch 'master' into TG-Removal
Dream-Master Feb 13, 2025
0539900
Merge branch 'master' into TG-Removal
Dream-Master Feb 14, 2025
8797caf
Merge branch 'master' into TG-Removal
Dream-Master Feb 15, 2025
902be8b
Merge branch 'master' into TG-Removal
serenibyss Feb 17, 2025
22cea79
Merge branch 'master' into TG-Removal
Dream-Master Feb 20, 2025
f3dc1ee
Merge branch 'master' into TG-Removal
Dream-Master Feb 20, 2025
102d1a5
Merge branch 'master' into TG-Removal
Dream-Master Feb 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import com.dreammaster.coremod.transformers.recipenukers.AdvancedSolarPanelTransformer;
import com.dreammaster.coremod.transformers.recipenukers.BibliocraftTransformer;
import com.dreammaster.coremod.transformers.recipenukers.GraviSuiteTransformer;
import com.dreammaster.coremod.transformers.recipenukers.TravellersGearTransformer;

public class DreamClassTransformer implements IClassTransformer {

Expand All @@ -27,7 +26,6 @@ public DreamClassTransformer() {
registerTransformer(new BibliocraftTransformer());
registerTransformer(new GraviSuiteTransformer());
registerTransformer(new ItemFocusWardingTransformer());
registerTransformer(new TravellersGearTransformer());
}

private void registerTransformer(IDreamTransformer transformer) {
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion src/main/java/com/dreammaster/scripts/ScriptLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ public static void run() {
new ScriptTinkersConstruct(),
new ScriptTinkersDefence(),
new ScriptTranslocator(),
new ScriptTravellersGear(),
new ScriptTwilightForest(),
new ScriptWarpTheory(),
new ScriptWirelessRedstone(),
Expand Down
105 changes: 0 additions & 105 deletions src/main/java/com/dreammaster/scripts/ScriptTravellersGear.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/assets/dreamcraft/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ tc.research_text.TalismanfoodtGTNH=Everfull belly
tc.research_page.TalismanfoodtGTNH=You often find yourself needing to take breaks during marathon researching sessions to satisfy your hunger. Finally you have found a way to get past your need for food.<BR><BR>By infusing a diamond with the essence of hunger, you have created an item that is able to suck the nourishing energy from various food items in your hotbar and store this energy within. It will then automatically replenish your food meter if it is depleted.<BR><BR>This device will only work on simple food items, so foods that invoke effects such as Rotten Flesh and Golden Apples must be consumed normally.
tc.research_name.DreamcatcherGTNH=Wispy Dreamcatcher
tc.research_text.DreamcatcherGTNH=Filtered thoughts
tc.research_name.CrucsoulGTNH=Crucible of Soulst
tc.research_name.CrucsoulGTNH=Crucible of Souls
tc.research_text.CrucsoulGTNH=Caution: Keep out of reach of children.
tc.research_name.ROD_TRANSMUTATION=Transmutative Wand Core
tc.research_text.ROD_TRANSMUTATION=One thing into another
Expand Down