craftingguide/website
1
0
Fork 0
Code Pull Requests Actions Activity

Merge branch 'crafting-algo-3'

Browse Source
This commit is contained in:
Andrew Miner
2017-05-02 19:25:08 -07:00
parent 90a41a59f0 7865ba98c3
commit b05e237aee
194 changed files with 310 additions and 5994 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/site/craft_page/craft_page.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - craft_page.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/craft_page/craft_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - craft_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/craft_page/craft_page_controller.coffee
+3 -3
View File
@@ -1,17 +1,17 @@
#
# Crafting Guide - craft_page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../base_controller'
CraftPage = require '../../models/site/craft_page'
Craftsman = require '../../models/crafting/craftsman'
{Craftsman} = require('crafting-guide-common').deprecated.crafting
CraftsmanWorkingController = require './craftsman_working/craftsman_working_controller'
InventoryController = require '../common/inventory/inventory_controller'
PageController = require '../page_controller'
SimpleInventory = require '../../models/crafting/simple_inventory'
{SimpleInventory} = require('crafting-guide-common').deprecated.crafting
StepController = require './step/step_controller'
########################################################################################################################
src/client/site/craft_page/craftsman_working/craftsman_working.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - craftsman_working.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/craft_page/craftsman_working/craftsman_working_controller.coffee
+2 -2
View File
@@ -1,12 +1,12 @@
#
# Crafting Guide - craftsman_working_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../../base_controller'
Craftsman = require '../../../models/crafting/craftsman'
{Craftsman} = require('crafting-guide-common').deprecated.crafting
########################################################################################################################
src/client/site/craft_page/step/step.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - step.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/craft_page/step/step.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - step.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/craft_page/step/step_controller.coffee
+2 -2
View File
@@ -1,14 +1,14 @@
#
# Crafting Guide - step_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../../base_controller'
InventoryController = require '../../common/inventory/inventory_controller'
RecipeController = require '../../common/recipe/recipe_controller'
SimpleInventory = require '../../../models/crafting/simple_inventory'
{SimpleInventory} = require('crafting-guide-common').deprecated.crafting
########################################################################################################################