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/item_page/item_page.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - item_page.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/item_page/item_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - item_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/item_page/item_page_controller.coffee
+4 -3
View File
@@ -1,20 +1,21 @@
#
# Crafting Guide - item_page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
EditableFile = require '../../models/site/editable_file'
Item = require '../../models/game/item'
{Item} = require('crafting-guide-common').deprecated.game
ItemGroupController = require '../common/item_group/item_group_controller'
ItemPage = require '../../models/site/item_page'
ItemSlug = require '../../models/game/item_slug'
{ItemSlug} = require('crafting-guide-common').deprecated.game
MarkdownSectionController = require '../common/markdown_section/markdown_section_controller'
MultiblockViewerController = require './multiblock_viewer/multiblock_viewer_controller'
PageController = require '../page_controller'
RecipeDetailController = require './recipe_detail/recipe_detail_controller'
VideoController = require '../common/video/video_controller'
w = require "when"
########################################################################################################################
src/client/site/item_page/multiblock_viewer/multiblock/multiblock.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - multiblock.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/item_page/multiblock_viewer/multiblock_viewer.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - multiblock_viewer.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/item_page/multiblock_viewer/multiblock_viewer_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - multiblock_viewer_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/item_page/recipe_detail/recipe_detail.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - recipe_detail.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/item_page/recipe_detail/recipe_detail.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - recipe_detail.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/item_page/recipe_detail/recipe_detail_controller.coffee
+3 -3
View File
@@ -1,15 +1,15 @@
#
# Crafting Guide - recipe_detail_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../../base_controller'
CraftingGridController = require '../../common/crafting_grid/crafting_grid_controller'
Inventory = require '../../../models/game/inventory'
{Inventory} = require('crafting-guide-common').deprecated.game
InventoryController = require '../../common/inventory/inventory_controller'
{StringBuilder} = require 'crafting-guide-common'
{StringBuilder} = require('crafting-guide-common').util
########################################################################################################################