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/base_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - base_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/browse_page/browse_page.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - browse_page.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/browse_page/browse_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - browse_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/browse_page/browse_page_controller.coffee
+2 -2
View File
@@ -1,14 +1,14 @@
#
# Crafting Guide - browse_page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
{CraftingGuideClient} = require('crafting-guide-common').api
ModBallotController = require './mod_ballot/mod_ballot_controller'
ModTileController = require './mod_tile/mod_tile_controller'
PageController = require '../page_controller'
{CraftingGuideClient} = require 'crafting-guide-common'
########################################################################################################################
src/client/site/browse_page/mod_ballot/mod_ballot.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - mod_ballot.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/browse_page/mod_ballot/mod_ballot.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - mod_ballot.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/browse_page/mod_ballot/mod_ballot_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - mod_ballot_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/browse_page/mod_ballot/mod_ballot_line/mod_ballot_line.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - mod_ballot_line.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/browse_page/mod_ballot/mod_ballot_line/mod_ballot_line.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - mod_ballot_line.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/browse_page/mod_ballot/mod_ballot_line/mod_ballot_line_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - mod_ballot_line_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/browse_page/mod_ballot/suggest_mod_panel/suggest_mod_panel.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - suggest_mod_panel.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/browse_page/mod_ballot/suggest_mod_panel/suggest_mod_panel.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - suggest_mod_panel.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/browse_page/mod_ballot/suggest_mod_panel/suggest_mod_panel_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - suggest_mod_panel_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/browse_page/mod_tile/mod_tile.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - mod_tile.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/browse_page/mod_tile/mod_tile.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - mod_tile.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/browse_page/mod_tile/mod_tile_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - mod_tile_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/adsense/adsense.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - adsense.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/adsense/adsense.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - adsense.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/adsense/adsense_controller.coffee
+2 -2
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - adsense_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
@@ -140,7 +140,7 @@ module.exports = class AdsenseController
adCount = @_computeAdCount @_computeAdType()
if adCount is 0
logger.verbose "Adsense is waiting for room to insert ads"
logger.trace "Adsense is waiting for room to insert ads"
@_waiting = true
_.delay (=> @_waiting = false; @_waitForPageReadiness()), c.adsense.readinessCheckInterval
else
src/client/site/common/crafting_grid/crafting_grid.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - crafting_grid.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/crafting_grid/crafting_grid_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - crafting_grid_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/inventory/inventory.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - inventory.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/inventory/inventory.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - inventory.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/inventory/inventory_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - inventory_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/item_group/item_group.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - item_group.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/item_group/item_group_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - item_group_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/item_group/item_tile/item_tile.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - item_tile.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/item_group/item_tile/item_tile_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - item_group_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/item_selector/element/element.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - element.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/item_selector/element/element.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - element.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/item_selector/element/element_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - element.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/item_selector/item_selector.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - item_selector.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/item_selector/item_selector.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - item_selector.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/item_selector/item_selector_controller.coffee
+2 -1
View File
@@ -1,13 +1,14 @@
#
# Crafting Guide - item_selector_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../../base_controller'
ItemSelector = require '../../../models/site/item_selector'
ElementController = require './element/element_controller'
w = require "when"
########################################################################################################################
src/client/site/common/markdown_section/markdown_image_list/markdown_image/markdown_image.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - markdown_image.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/markdown_section/markdown_image_list/markdown_image/markdown_image.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - markdown_image.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/markdown_section/markdown_image_list/markdown_image_list.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - markdown_image_list.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/markdown_section/markdown_image_list/markdown_image_list.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - markdown_image_list.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/markdown_section/markdown_image_list/markdown_image_list_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - markdown_image_list_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/markdown_section/markdown_section.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - markdown_section.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/markdown_section/markdown_section.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - markdown_section.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/markdown_section/markdown_section_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - markdown_section_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/recipe/recipe.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - recipe.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/recipe/recipe_controller.coffee
+2 -2
View File
@@ -1,14 +1,14 @@
#
# Crafting Guide - recipe_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../../base_controller'
CraftingGridController = require '../crafting_grid/crafting_grid_controller'
SlotController = require '../slot/slot_controller'
{StringBuilder} = require 'crafting-guide-common'
{StringBuilder} = require('crafting-guide-common').util
########################################################################################################################
src/client/site/common/slot/slot.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - slot.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/slot/slot_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - slot_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/stack/stack.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - stack.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/stack/stack.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - stack.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/stack/stack_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - stack_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/common/twitter/twitter.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - twitter.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/twitter/twitter.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - news_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/video/video.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - video.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/common/video/video.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - video.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/common/video/video_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - video_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
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
########################################################################################################################
src/client/site/feedback/feedback.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - feedback.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/feedback/feedback.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - feedback.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/feedback/feedback_controller.coffee
+2 -1
View File
@@ -1,12 +1,13 @@
#
# Crafting Guide - feedback_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BaseController = require '../base_controller'
EmailClient = require '../../models/site/email_client'
w = require "when"
########################################################################################################################
src/client/site/footer/footer.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - footer.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/footer/footer.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - footer.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/footer/footer_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - footer_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/header/header.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - header.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/header/header.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - header.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/header/header_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - header_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/image_loader.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - image_loader.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/index.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - index.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/index.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - index.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
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
########################################################################################################################
src/client/site/login_page/login_page.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - login_page.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/login_page/login_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - login_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/login_page/login_page_controller.coffee
+2 -2
View File
@@ -1,13 +1,13 @@
#
# Crafting Guide - login_page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
PageController = require '../page_controller'
GitHubUser = require '../../models/site/github_user'
{CraftingGuideClient} = require 'crafting-guide-common'
{CraftingGuideClient} = require('crafting-guide-common').api
########################################################################################################################
src/client/site/mod_page/mod_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/mod_page/mod_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - mod_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/mod_page/mod_page_controller.coffee
+6 -7
View File
@@ -1,16 +1,15 @@
#
# Crafting Guide - mod_page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
PageController = require '../page_controller'
Item = require '../../models/game/item'
ItemGroupController = require '../common/item_group/item_group_controller'
Mod = require '../../models/game/mod'
ModVersionSelectorController = require '../common/mod_version_selector/mod_version_selector_controller'
TutorialController = require './tutorial/tutorial_controller'
{Item} = require('crafting-guide-common').deprecated.game
ItemGroupController = require '../common/item_group/item_group_controller'
{Mod} = require('crafting-guide-common').deprecated.game
PageController = require '../page_controller'
TutorialController = require './tutorial/tutorial_controller'
########################################################################################################################
src/client/site/mod_page/tutorial/tutorial.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - tutorial.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/mod_page/tutorial/tutorial.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - tutorial.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/mod_page/tutorial/tutorial_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - tutorial_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/news_page/news_page.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - news_page.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/news_page/news_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - news_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//
src/client/site/news_page/news_page_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - news_page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/page_controller.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - page_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
src/client/site/router.coffee
+10 -10
View File
@@ -1,19 +1,19 @@
#
# Crafting Guide - router.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
BrowsePageController = require './browse_page/browse_page_controller'
CraftPageController = require './craft_page/craft_page_controller'
ItemPageController = require './item_page/item_page_controller'
ItemSlug = require '../models/game/item_slug'
LoginPageController = require './login_page/login_page_controller'
ModPageController = require './mod_page/mod_page_controller'
NewsPageController = require './news_page/news_page_controller'
TutorialPageController = require './tutorial_page/tutorial_page_controller'
UrlParams = require './url_params'
BrowsePageController = require './browse_page/browse_page_controller'
CraftPageController = require './craft_page/craft_page_controller'
ItemPageController = require './item_page/item_page_controller'
{ItemSlug} = require('crafting-guide-common').deprecated.game
LoginPageController = require './login_page/login_page_controller'
ModPageController = require './mod_page/mod_page_controller'
NewsPageController = require './news_page/news_page_controller'
TutorialPageController = require './tutorial_page/tutorial_page_controller'
UrlParams = require './url_params'
########################################################################################################################
src/client/site/site_controller.coffee
+3 -3
View File
@@ -1,7 +1,7 @@
#
# Crafting Guide - site_controller.coffee
#
# Copyright © 2014-2016 by Redwood Labs
# Copyright © 2014-2017 by Redwood Labs
# All rights reserved.
#
@@ -13,8 +13,8 @@ FooterController = require './footer/footer_controller'
GitHubUser = require '../models/site/github_user'
HeaderController = require './header/header_controller'
ImageLoader = require './image_loader'
Mod = require '../models/game/mod'
ModPack = require '../models/game/mod_pack'
{Mod} = require('crafting-guide-common').deprecated.game
{ModPack} = require('crafting-guide-common').deprecated.game
Router = require './router'
########################################################################################################################
src/client/site/tutorial_page/tutorial_page.jade
+1 -1
View File
@@ -1,7 +1,7 @@
//-
//- Crafting Guide - tutorial_page.jade
//-
//- Copyright © 2014-2016 by Redwood Labs
//- Copyright © 2014-2017 by Redwood Labs
//- All rights reserved.
//-
src/client/site/tutorial_page/tutorial_page.scss
+1 -1
View File
@@ -1,7 +1,7 @@
//
// Crafting Guide - tutorial_page.scss
//
// Copyright © 2014-2016 by Redwood Labs
// Copyright © 2014-2017 by Redwood Labs
// All rights reserved.
//

Some files were not shown because too many files have changed in this diff Show More