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/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.
#