Skip to content

Commit

Permalink
Merge pull request #1 from sayterdarkwynd/master
Browse files Browse the repository at this point in the history 
Let's just do this.
  • Loading branch information
@Velvet-Claw
Velvet-Claw committed Jan 16, 2020
2 parents e07e6a8 + 1e3669a commit e1f2e21
Show file tree
Hide file tree
Showing 7,312 changed files with 28,616 additions and 4,514 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .metadata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"requires" : [],
"steamContentId" : "729480149",
"tags" : "Crafting and Building|Miscellaneous|Planets and Environments|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|User Interface|Furniture and Objects|Food and Farming|Mechanics|Vehicles and Mounts|Armor and Clothes",
"version" : "5.6.365"
"version" : "5.6.374"
}
17 changes: 5 additions & 12 deletions EES_transmutationstudylist.config.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
{ "op": "add", "path": "/hunt/T1/monsterplating", "value": true},

// Hunt - T2
{ "op": "add", "path": "/hunt/T1/fulobster", "value": true},

{ "op": "add", "path": "/hunt/T2/fulobster", "value": true},
{ "op": "add", "path": "/hunt/T2/fupest", "value": true},

// Mine - T1
{ "op": "add", "path": "/mine/T1/bone", "value": true},
{ "op": "add", "path": "/mine/T1/lead", "value": true},
Expand All @@ -47,14 +48,6 @@
{ "op": "add", "path": "/mine/T2/thoriumore", "value": true},
{ "op": "add", "path": "/mine/T2/triangliumore", "value": true},
{ "op": "add", "path": "/mine/T2/zerchesiumore", "value": true},
{ "op": "add", "path": "/mine/T2/plutoniumore", "value": true}

// Mine - T3
// { "op": "add", "path": "/mine/T3/blooddiamond", "value": true},
// { "op": "add", "path": "/mine/T3/densiniumore", "value": true},
// { "op": "add", "path": "/mine/T3/effigiumore", "value": true},
// { "op": "add", "path": "/mine/T3/isogenore", "value": true},
// { "op": "add", "path": "/mine/T3/nocxiumore", "value": true},
// { "op": "add", "path": "/mine/T3/pyreiteore", "value": true},
// { "op": "add", "path": "/mine/T3/xithriciteore", "value": true}
{ "op": "add", "path": "/mine/T2/plutoniumore", "value": true},
{ "op": "add", "path": "/mine/T2/uraniumore", "value": true}
]
7 changes: 3 additions & 4 deletions _FUcredits.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"credits" : "

Contributors, staff, retired staff, and featured mods:
Contributors, staff, retired staff, and featured mods/modders:

- AbsoluteXeroEX
- Aegonian
Expand Down Expand Up @@ -53,7 +53,7 @@ Contributors, staff, retired staff, and featured mods:
- Gezbo
- Gigabit
- GoreFly
- Green
- Green / 0x00FF00
- Grim
- GTG3000
- Guidez
Expand All @@ -75,6 +75,7 @@ Contributors, staff, retired staff, and featured mods:
- Iris Blanche
- Iroaseta
- I Said No / Gay Monster Dad
- Sock_Bunny
- Izuna
- Jaxine
- Jorhlok
Expand Down Expand Up @@ -113,7 +114,6 @@ Contributors, staff, retired staff, and featured mods:
- NeWeeGee
- NiKiNiT
- NotMrFlibble
- NotMrFlibble
- OCRemix.org
- ohgoditburns
- Omega
Expand Down Expand Up @@ -179,7 +179,6 @@ Contributors, staff, retired staff, and featured mods:
- Unsubreddun
- Uxie
- Vagak
- Vagak
- Valo
- Vetpetmon
- Vincent
Expand Down

0 comments on commit e1f2e21

Please sign in to comment.