<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,18 @@
+== 1.6.0 (2009-07-20) ==
+* Added flags to control uniqueness/transferability of items.
+* Crafting system implemented.
+    * A user can purchase recipes. These recipes have a list of materials; a user can then turn some
+      raw materials in to another item entirely.
+    * Two new pieces of artwork have been added. Thanks to Tigress once again!
+* User_Item API refactored.
+* Updated database ER diagram
+* English inflections fixed up a bit.
+* Updated library submodule versions. We're now using ActiveTable 2.5.0 and Smarty 2.6.26.
+* Updated HTML Purifier to 4.0.
+* Updated TinyMCE and Spry.
+    * Preferences page uses the (new) password/confirmation validations in Spry now.
+    * A TinyMCE / Spry conflict was observed and repaired (in the TinyMCE code). 
+
 == 1.5.0 (2009-07-05) ==
 * Bugfix in moderation panel.
 * Fixed a typo in the moderation panel.</diff>
      <filename>CHANGES</filename>
    </modified>
    <modified>
      <diff>@@ -6,8 +6,8 @@
 
 == Testers / Bug Reporters ==
 * Edward &lt;are.you.cursed@gmail.com&gt;
-* Patra &lt;http://www.virtualpetlist.com/member.php?u=1495&gt;
-* Haywire &lt;http://www.virtualpetlist.com/member.php?u=418&gt;
+* Patra
+* Haywire
 
 == Special Thanks ==
 * The rest of the Yasashii crew.</diff>
      <filename>CREDITS</filename>
    </modified>
    <modified>
      <diff>@@ -10,45 +10,13 @@
              |_|\_\_|\__|\__\___/ 
 =================================================
 
-Welcome to KittoKittoKitto, a Virtual Pet Site template app.
-
-Kitto's goals are simple:
-    
-    * Help new petgame developers get off the ground as quickly as possible.
-      Writing the whole register/login/boards/adopt pet thing over and over
-      is a pointless waste of time.
-
-      That said, it is not within the scope of Kitto to provide *everything*
-      you would see in a run-of-the-mill petgame. What is in this package is
-      every major feature a basic installation of Kitto is going to provide.
-      
-      There is no battle stadium or trading post. There are not even user
-      shops! The purpose of Kitto is to provide *the very basic* components.
-      It is my personal belief that providing *too much* functionaility will
-      just encourage dozens of sites using the Kitto code and *no*
-      custmizations to speak of will spring up.
-      
-      Your game should be unique - but that does not mean you should waste
-      time re-inventing the wheel. I will probably be publishing several
-      extensions to Kitto to add those functions, but they will be optional
-      (and, of course, Free) add-ons.  
-    
-    * Help educate brand-new and novice programmers by giving them a well-
-      designed application to hack away at. The code in Kitto will (hopefully)
-      service as an inspiration light of Best Practices and Brilliantly DRY
-      code to the next generation of pet-game developers.  
-    
-      I started programming because of petgames. Three years later, I work for 
-      an ISP doing web applications. I want that to happen to you, too - it's 
-      fun, it's good experience, it makes money. I built a career because of
-      what I learned, and I am all about sharing that experience with whoever
-      is willing. 
+Welcome to KittoKittoKitto, a completely free virtual pet game framework for you 
+to build upon.
 
 == Installation ==
-The Kitto wiki is gone, but you can find install directions in ModularGaming's
-wiki. This old revision of their install document is what you want:
-
-&lt;http://modulargaming.com/projects/modulargaming/wiki/MgInstall?version=13&gt;
+See the Kitto documentation for installation instructions:
+    
+    &lt;http://kitto.yasashiisyndicate.org/docs/kitto/install.html&gt;
 
 == Post-Installation ==
 My tips to you at this point:
@@ -57,15 +25,13 @@ My tips to you at this point:
       really isn't that much code to look at - most of the work is being done
       by ActiveTable automagically.
 
-    * __LEARN HOW TO USE ACTIVETABLE__. It's a brand-new library, and docs are
-      still forthcoming (although there's pretty good in-line documentation that
-      can be compiled into HTML with phpdocumentor), but ActiveTable is a 
-      *SERIOUS* timesaver. Without it, I would not have been able to write
-      Kitto in (literally) five days. 
+    * __LEARN HOW TO USE ACTIVETABLE__. Docs can be found on the Kitto website, 
+      and there's pretty good in-line documentation that can be compiled into 
+      HTML with phpdocumentor. ActiveTable is a *SERIOUS* timesaver. Without it, 
+      I would not have been able to write the first iteration of Kitto in 
+      (literally) five days. 
 
-      There's some documentation for the library at 
-      &lt;http://elsa.godless-internets.org/aphp/index.php/ActiveTable&gt;. It's not complete, 
-      but it's not exactly sparse, either. 
+      &lt;http://kitto.yasashiisyndicate.org/documentation.html&gt;
       
       Writing and debugging SQL is a bitch. It's error-prone. It's a timesink. 
       Why not have most of your SQL written for you by ActiveTable? ;-)
@@ -88,8 +54,7 @@ My tips to you at this point:
      over, at the very least!
 
 Nick 'Owl' Evans, 2007-09-22
+Last Updated on 2009-07-14.
 
 KittoKittoKitto has been brought to you by the Yasashii Syndicate. 
 &lt;http://yasashiisyndicate.org&gt;
-
-Yasashii yoake, guys!</diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,50 @@
+== 1.5.0 to 1.6.0 ==
+Apply the patches in patch/ from the root of your Kitto install.
+
+Replace resource/tinymce with the folder from this version.
+Replace resource/script with the folder from this version.
+Replace external_lib/ with the folder from this version.
+
+Run the following SQL to update your schema (MySQL):
+
+    CREATE TABLE `item_recipe_material` (
+      `item_recipe_material_id` int(11) NOT NULL auto_increment,
+      `recipe_item_type_id` int(11) NOT NULL,
+      `material_item_type_id` int(11) NOT NULL,
+      `material_quantity` int(11) NOT NULL default '1',
+      PRIMARY KEY  (`item_recipe_material_id`),
+      UNIQUE KEY `recipe_item_type_id` (`recipe_item_type_id`,`material_item_type_id`)
+    ) ENGINE=InnoDB;
+
+    CREATE TABLE `item_recipe_type` (
+      `item_recipe_type_id` int(11) NOT NULL auto_increment,
+      `recipe_type_description` varchar(20) NOT NULL,
+      PRIMARY KEY  (`item_recipe_type_id`)
+    ) ENGINE=InnoDB;
+
+    ALTER TABLE `item_class` ADD COLUMN `normal_inventory_display` enum('Y','N') NOT NULL;
+    ALTER TABLE `jump_page` ADD COLUMN `show_layout` enum('Y','N') NOT NULL default 'Y' AFTER `layout_type`;
+
+    ALTER TABLE `item_type` 
+        ADD COLUMN `item_recipe_type_id` int(11) NOT NULL,
+        ADD COLUMN `recipe_created_item_type_id` int(11) NOT NULL,
+        ADD COLUMN `recipe_batch_quantity` int(11) NOT NULL,
+        ADD COLUMN `unique_item` enum('N','Y') NOT NULL,
+        ADD COLUMN `transferable_item` enum('Y','N') NOT NULL;
+
+    ALTER TABLE `item_type`
+        ADD INDEX (`item_name`),
+        ADD INDEX (`item_recipe_type_id`,`recipe_created_item_type_id`);
+
+    INSERT INTO jump_page (`page_title,`page_html_title`,`layout_type`,`show_layout`,`page_slug`,`access_level`,`restricted_permission_api_name`,`php_script`,`include_tinymce`,`active`) VALUES 
+    ('AJAX Item Search Callback','','deep','N','item-search-ajax','user','','items/ajax_widget_search.php','N','Y'),
+    ('Manage Recipe Materials','Manage Recipe Materials','deep','Y','admin-recipe','restricted','manage_items','admin/items/recipe_materials.php','N','Y'),
+    ('Add Recipe Materials','Add Recipe Materials','deep','Y','admin-recipe-add','restricted','manage_items','admin/items/recipe_add_material.php','N','Y'),
+    ('Crafting','Crafting','deep','Y','crafting','user','','crafting/list.php','N','Y'),
+    ('Crafting','Crafting','deep','Y','craft','user','','crafting/recipe.php','N','Y');
+
+    INSERT INTO `item_class` (`item_class_id`, `php_class`, `class_descr`, `relative_image_dir`, `verb`, `one_per_use`, `normal_inventory_display`) VALUES (4,'Recipe_Item','Recipe','recipe','creates','N','N');
+
 == 1.4.0 to 1.5.0 ==
 Apply the patches in patch/ from the root of your Kitto install.
 </diff>
      <filename>UPGRADING</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d0d9a19ea7a8527c461ffee534720dde3d0205f8</id>
    </parent>
  </parents>
  <author>
    <name>Nicholas 'OwlManAtt' Evans</name>
    <email>owlmanatt@gmail.com</email>
  </author>
  <url>http://github.com/OwlManAtt/kittokittokitto/commit/627c75baa0be32025ce950f3115ddde8b8cd6e36</url>
  <id>627c75baa0be32025ce950f3115ddde8b8cd6e36</id>
  <committed-date>2009-07-19T23:14:45-07:00</committed-date>
  <authored-date>2009-07-19T23:14:45-07:00</authored-date>
  <message>Updated README/etc for 1.6.0.</message>
  <tree>47be0897841e8a094fa3bb463fbfbd4cc87ada58</tree>
  <committer>
    <name>Nicholas 'OwlManAtt' Evans</name>
    <email>owlmanatt@gmail.com</email>
  </committer>
</commit>
