Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Miner 9424af9d84 Initial version of the new crafting table 2015-01-08 11:03:43 -08:00
Andrew Miner 9f79722378 Refactor image loading code into ImageLoader class 2015-01-07 11:20:49 -08:00
Andrew Miner 4a10a36e37 Fix CraftingPlan tests 2015-01-07 08:48:30 -08:00
Andrew Miner f51082a1cb Add ability to craft multipl items at once
* Remove the old crafting table view
* Complete UI/UX of the inventory view
2015-01-07 08:31:53 -08:00
Andrew Miner a1a7ee5dc9 Initial implementation of the InventoryController 2015-01-06 10:25:05 -08:00
Andrew Miner d499e8e9cf Update jQuery UI to include class transitions 2015-01-06 10:02:56 -08:00
Andrew Miner 61027daf0a Update header 2015-01-05 06:55:51 -08:00
Andrew Miner 206973e304 Update header comments 2015-01-05 06:42:05 -08:00
Andrew Miner bba161445d Change "{furnace fuel}" to just "furnace fuel" 2015-01-04 21:26:25 -08:00
Andrew Miner 13b9874afd Update Buildcraft recipies to version 6.2.6 2015-01-04 21:25:52 -08:00
Andrew Miner a5a2ee0534 Fix missing MC 1.7.10 images 2015-01-04 21:25:14 -08:00
Andrew Miner 96d7f56280 Add images for BC 6.2.6 2015-01-04 21:24:12 -08:00
Andrew Miner 5c5ea861cc Show list to make in order to be made 2015-01-04 15:18:00 -08:00
Andrew Miner 761a244a83 Fix output of unparsing V1 of the data format 2015-01-04 13:14:02 -08:00
Andrew Miner 549abc1224 Improve layout of stacks in crafting table 2015-01-04 11:35:43 -08:00
Andrew Miner e99a688b7e Add remaining MC 1.7.10 images 2015-01-04 11:33:48 -08:00
Andrew Miner 150e85bb49 Display images for each item referenced 2015-01-04 01:01:00 -08:00
Andrew Miner fc97854718 Add more MC 1.7.10 images 2015-01-04 00:58:06 -08:00
Andrew Miner 0d25ac723d Complete refactoring to move Recipes into Items
* Changed "version" to "dataVersion" in data format
* Changed the "modName" and "modVersion" fields on the ModVersion
  class to remove the "mod" prefix and changed the data format to
  match
* Change the Stack class to use the itemSlug instead of the item
  itself
* Update the ModVersion and ModPack classes to include methods for
  recording a correspondence between slugs and names. Update code
  which displays items from stacks to use these methods to determine
  display names.
* Add a reference from Recipe back to the item it creates
2015-01-03 20:08:11 -08:00
Andrew Miner 392c410df8 Add some missing recipes 2015-01-03 19:36:19 -08:00
Andrew Miner 343c27e68d Add more MC 1.7.10 images 2015-01-03 19:29:08 -08:00
Andrew Miner b642c51486 wip 2015-01-02 23:03:06 -08:00
Andrew Miner e389c01468 Add images for Minecraft items 2015-01-02 22:12:48 -08:00
Andrew Miner f16c01ca3d Clear recipeName field on focus 2015-01-01 21:38:58 -08:00
Andrew Miner 3493c41b39 Fix bug where deep links don't compute 2015-01-01 20:54:16 -08:00
Andrew Miner 1434533e92 Add Coal as a raw material 2015-01-01 20:39:55 -08:00
Andrew Miner ca5fed7f26 Update UI to reflect Recipe Catalog -> Mod Pack 2015-01-01 20:18:01 -08:00
Andrew Miner e14a4d0810 Rename RecipeCatalog to ModPack 2015-01-01 20:16:38 -08:00
Andrew Miner f28a763b13 Rename RecipeBook to ModVersion 2015-01-01 20:12:27 -08:00
Andrew Miner 5d4bf92948 Allow reformat to accept diff src/target 2015-01-01 19:58:06 -08:00
Andrew Miner 1a9ae1791e Require input as part of all recipes 2015-01-01 19:06:04 -08:00
Andrew Miner 0c781793c6 Move recipebooks to subdirs for each mod 2015-01-01 19:00:37 -08:00
Andrew Miner a265383630 Update Minecraft recipebook with more recipes 2015-01-01 11:06:25 -08:00
Andrew Miner 57c6cca436 Rename vanilla.json to minecraft.json 2014-12-29 15:09:25 -08:00
Andrew Miner 516e9f0b5b Update recipe books to new format 2014-12-29 14:47:55 -08:00
Andrew Miner c46bb8860c Add better support for turning mods on/off
* Make the Minecraft "mod" enabled at all times
* Sort the list of mods to move required mods to the top
* Automatically enable a mod which has a recipe selected (e.g., from
  a query param)
2014-12-29 14:07:57 -08:00
Andrew Miner 2dd4b7014f Continue to look for recipes in disabled books
Update models so that when a recipe book is disabled, it no longer is
used for finding names to display in the UI, but it is still used for
finding recipes to make.
2014-12-29 12:38:07 -08:00
Andrew Miner 004320d052 Fix bug with recipe books table 2014-12-29 09:07:39 -08:00
Andrew Miner 372a1e0063 Allow recipe books to be enabled/disabled 2014-12-29 09:03:28 -08:00
Andrew Miner 2d8de7ba23 Remove old version of the website 2014-12-28 19:08:35 -08:00
Andrew Miner 338dae492a Allow /item as URL on test server 2014-12-28 18:59:25 -08:00
Andrew Miner a453712409 Fix bug causing /item/null URLs 2014-12-28 17:39:56 -08:00
Andrew Miner 2ffd6274b7 Update deploy to use new S3 setup 2014-12-28 17:35:58 -08:00
Andrew Miner bf113d26ab Update URL scheme to include /item/*
* Update the router to understand /item/:name routes in addition to
  v1.0-style parameterized routes
* Add support for updating the current URL based upon the item being
  viewed
* Change LandingPage* to ItemPage*
2014-12-28 12:59:29 -08:00
Andrew Miner 8cde02a10b Update test server to use Express 2014-12-28 12:58:53 -08:00
Andrew Miner ef1e9816c1 Enable client-side source maps for CoffeeScript 2014-12-28 12:58:32 -08:00
Andrew Miner a3723dd667 Recognize CraftingGuide 1.0 query parameters 2014-12-27 19:15:20 -08:00
Andrew Miner 03d8f84a0d Add auto-complete drop-down for crafting selection 2014-12-26 14:02:27 -08:00
Andrew Miner 0d2e175410 Add jQuery-UI as a dependency 2014-12-26 14:01:57 -08:00
Andrew Miner 1a84ce2e28 Complete basic crafting functionality 2014-12-24 19:17:37 -08:00
Andrew Miner 3ea6a845c7 Fix bug where tools status was not in recalculate 2014-12-23 20:32:50 -08:00
Andrew Miner 95c15abe10 Added CraftingTable* components and UI 2014-12-23 20:26:36 -08:00
Andrew Miner b05fc4c5c9 Complete the RecipeBook controller 2014-12-23 09:12:02 -08:00
Andrew Miner 9fc0407fe4 Remove "dist" directory (only for build products) 2014-12-22 16:44:55 -08:00
Andrew Miner 16832e02dd Step 1 in converting to a Backbone-based website 2014-12-22 16:36:04 -08:00
Andrew Miner dc9fd0de07 Update code to load recipe books synchronously 2014-11-02 21:00:18 -08:00
Andrew Miner 814c2b7c39 Update deploy script to work with S3 2014-11-02 20:44:17 -08:00
Andrew Miner e4d7e8b883 Merge pull request #41 from MCE626/patch-1
Create more_blocks.json
2014-11-02 20:43:40 -08:00
Andrew Miner f08855b339 Added gravisuite.json provided by flotschi301 2014-11-02 13:27:01 -08:00
Andrew Miner ec696aea9a Merge pull request #40 from whizzball1/patch-7
Thermal Expansion, finished all recipes
2013-10-14 07:28:34 -07:00
Andrew Miner b6497e3d7c Merge pull request #39 from judos/master
added Applied Energetics rv12-b
2013-10-09 19:39:57 -07:00
Andrew Miner bf85b6f4a7 Add Static Boots to IC2 recipes 2013-09-04 09:06:42 -07:00
Andrew Miner 3ae83f5986 Fix Composite Vest recipe for IC2 2013-09-04 08:21:06 -07:00
Andrew Miner 0cb0ae8800 Add CF Pack receipe to IC2 2013-09-04 08:09:52 -07:00
Andrew Miner 8afdc01bd7 Fix recipe for Quantum Helmet 2013-09-03 08:54:54 -07:00
Andrew Miner a33697b7b4 Avoid cycle by removing Wool from String recipe
* The crafting algorithm isn't quite smart enough yet to detect cycles, so
  adding recipes like String -> Wool and Wool -> String will cause infinite
  loops.  So, for now, I'm removing such recipes until the algorithm is fixed.
2013-09-03 00:11:58 -07:00
Andrew Miner b7645267f0 Merge pull request #37 from whizzball1/patch-6
Thermal Expansion, added all the Machines.
2013-09-03 00:09:05 -07:00
Andrew Miner 40c7b7a59a Merge branch 'ZL123-recipes'
Conflicts:
	html/data/vanilla.json
2013-09-03 00:03:56 -07:00
Andrew Miner 5f59fdab6c Correct added vanilla recipes from ZL123 2013-09-03 00:00:33 -07:00
Andrew Miner af7fa853b0 Re-add tools to crafting calculation 2013-09-02 14:38:11 -07:00
Andrew Miner aae80c0bf1 Re-connect user inventory to crafting 2013-09-02 12:30:58 -07:00
Andrew Miner f89de8abd8 [#13, #23] Add support for alternate recipes
* Added support for determining all the possibly ways to create a given item
* Added full unit test support
2013-09-02 12:24:08 -07:00
Andrew Miner 813f7a0c2e Fixed recipe for Nuclear Reactor 2013-09-01 00:18:00 -07:00
Andrew Miner 9f413d54dc Fix mis-spelling in IC2 recipe 2013-08-30 00:44:05 -07:00
Andrew Miner 28480ebe18 Finished IC2 recipes 2013-08-29 23:39:23 -07:00
Andrew Miner 3f54f7a3aa Add nuclear reactor component recipes 2013-08-28 23:05:15 -07:00
Andrew Miner 871fcf852b Convert crafting output lists to tables 2013-08-22 23:51:28 -07:00
Andrew Miner f8eed010d5 Added all the "Machines" recipes for IC2 2013-08-22 22:15:22 -07:00
Andrew Miner 58f0c5677d Merge pull request #36 from whizzball1/patch-5
Added Bricks (block)
2013-08-22 09:33:22 -07:00
Andrew Miner 32e2a8a1ee [#1] Add inventory and update calc's to use it 2013-08-21 22:24:14 -07:00
Andrew Miner 79c55a2120 Merge pull request #33 from whizzball1/patch-1
Created Thermal Expansion
2013-08-21 21:08:50 -07:00
Andrew Miner 07d147a455 [#31] Upgrade recipe selector to support search
* Add the jQuery-UI autocomplete component instead of a regular select control
  for choosing recipes
2013-08-21 20:30:56 -07:00
Andrew Miner 56421ab074 Remove toolsIncluded URL parameter 2013-08-21 01:04:48 -07:00
Andrew Miner ab3321ce86 [#25] Add "include tools" selector 2013-08-20 19:36:48 -07:00
Andrew Miner 7b239580c1 Merge pull request #27 from ZL123/master
Added recipes for Beacon, TNT, and Buttons.
2013-08-20 19:09:16 -07:00
Andrew Miner a9e699087e Merge pull request #26 from whizzball1/patch-1
Added Silver Ingot Recipe
2013-08-20 16:10:17 -07:00
Andrew Miner ee52b06753 Move wordmark to correct file name 2013-08-20 08:11:11 -07:00
Andrew Miner 2828c52127 Add more IC2 recipes / add workmark 2013-08-20 08:10:07 -07:00
Andrew Miner ba83e8d205 [#14] Add list of crafted items
* This is step toward implementing #14 in that it shows you a list of the items
  which need to be crafted.  However, it still doesn't show you the steps and
  proper order in which to craft everything.
2013-08-19 23:05:26 -07:00
Andrew Miner 87c6664363 Added "Energy and Wiring" items for IC2 2013-08-19 19:49:41 -07:00
Andrew Miner 214cce6c4f [#19] Sort recipe names within each optgroup 2013-08-19 19:21:05 -07:00
Andrew Miner db0605095f Fix bug with previous change 2013-08-19 18:11:11 -07:00
Andrew Miner 0dbf775f35 [#22] Change page url when changing item
* Update page title when changing items
* Update page URL to reflect proper url when changing items
* Send another pageview to Google Analytics after changing the page
2013-08-19 18:05:44 -07:00
Andrew Miner 50fdab3ff1 Added a partial recipe book for IC2
* Added some missing recipes for the vanilla recipe book
2013-08-19 00:52:54 -07:00
Andrew Miner 3a7a4d602f Added Wrench to BuildCraft recipe book 2013-08-18 20:42:57 -07:00
Andrew Miner 44b6e59a0c Fix quantities for pipe recipes 2013-08-18 20:11:19 -07:00
Andrew Miner e16c3c0f68 Fix bug with non-crafted tools being lost
* If a "tool" is also a raw material (e.g., as a "cow" is for producing milk),
  be sure to add it to the inventory so that it shows up as one of the outputs
2013-08-18 19:27:38 -07:00
Andrew Miner 608414088c Add missing waterproof pipe recipes for BC 2013-08-18 19:22:33 -07:00
Andrew Miner 8339bf97f6 Sorted BuildCraft recipes and added Refinery 2013-08-18 19:13:19 -07:00
Andrew Miner 8b3e98c5e7 [#21] Add support for linking to a certain recipe 2013-08-18 17:09:02 -07:00