Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
NielsPilgaard committed Jul 3, 2021
2 parents 5b45d18 + ae4746b commit 1ced607
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions config/resourcefulbees/bees/magic/Starry.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
"maxTimeInHive": 4800,
"hasHoneycomb": true,
"traits": ["can_swim"],
"baseLayerTexture": "other/starry",
"ColorData": {
"honeycombColor": "#C0C0C0",
"isBeeColored": true,
"primaryColor": "#C0C0C0",
"secondaryColor": "#00FFBF"
"honeycombColor": "#062D86",
"isBeeColored": false,
"primaryColor": "#0E1250",
"secondaryColor": "#ACB5F8"
},
"CombatData": {
"isPassive": false,
Expand All @@ -21,3 +22,4 @@
"BreedData": {"isBreedable": false},
"TraitData": {"hasTraits": true}
}

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1ced607

Please sign in to comment.