Merged latest database.

DestinyItemManager · Feb 19, 2016 · 1f11b4e · 1f11b4e
1 parent e1f8470
commit 1f11b4e
Show file tree

Hide file tree

Showing 56 changed files with 61 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.3.1
+
+* Updated the manifest file.
+
 # 3.3
 
 * Infusion auto calculator is much faster.

diff --git a/app/common/destiny_content/icons/029e9507b6bb76f7da82009e0866c8cc.png b/app/common/destiny_content/icons/029e9507b6bb76f7da82009e0866c8cc.png
diff --git a/app/common/destiny_content/icons/0799659705dd970a02543af8b572a4c5.png b/app/common/destiny_content/icons/0799659705dd970a02543af8b572a4c5.png
diff --git a/app/common/destiny_content/icons/0d76b29bac3b402e171f2bdaa4d15c0a.png b/app/common/destiny_content/icons/0d76b29bac3b402e171f2bdaa4d15c0a.png
diff --git a/app/common/destiny_content/icons/2161de12bc6962f273737c236c37de23.png b/app/common/destiny_content/icons/2161de12bc6962f273737c236c37de23.png
diff --git a/app/common/destiny_content/icons/280f6d8c7fe80a2046c9f2147d2f31ce.png b/app/common/destiny_content/icons/280f6d8c7fe80a2046c9f2147d2f31ce.png
diff --git a/app/common/destiny_content/icons/2d68e2a9735782287f2b2515d3b11689.png b/app/common/destiny_content/icons/2d68e2a9735782287f2b2515d3b11689.png
diff --git a/app/common/destiny_content/icons/30ac3cfdf41aed7988685302dca80248.png b/app/common/destiny_content/icons/30ac3cfdf41aed7988685302dca80248.png
diff --git a/app/common/destiny_content/icons/34481bf6f8252d6a9acc90d1b7c77009.png b/app/common/destiny_content/icons/34481bf6f8252d6a9acc90d1b7c77009.png
diff --git a/app/common/destiny_content/icons/3fdff04a7bad3bdfd262156c536a6262.png b/app/common/destiny_content/icons/3fdff04a7bad3bdfd262156c536a6262.png
diff --git a/app/common/destiny_content/icons/475117c6c3ac5c1643b5d3b8479be598.png b/app/common/destiny_content/icons/475117c6c3ac5c1643b5d3b8479be598.png
diff --git a/app/common/destiny_content/icons/4841d6d198a044a58a3cc4416e769635.png b/app/common/destiny_content/icons/4841d6d198a044a58a3cc4416e769635.png
diff --git a/app/common/destiny_content/icons/4cba34ce1fa8a4f87557ad03e4031e42.png b/app/common/destiny_content/icons/4cba34ce1fa8a4f87557ad03e4031e42.png
diff --git a/app/common/destiny_content/icons/4f2f66f79deb6bc9d413a01ef914394e.png b/app/common/destiny_content/icons/4f2f66f79deb6bc9d413a01ef914394e.png
diff --git a/app/common/destiny_content/icons/593c6946de135c33abb6857c4ac4c831.png b/app/common/destiny_content/icons/593c6946de135c33abb6857c4ac4c831.png
diff --git a/app/common/destiny_content/icons/5af6a8636d3bfb88aa2a03b2cb490952.png b/app/common/destiny_content/icons/5af6a8636d3bfb88aa2a03b2cb490952.png
diff --git a/app/common/destiny_content/icons/5d889c4c3ac5b3d359a80c6709089e0c.png b/app/common/destiny_content/icons/5d889c4c3ac5b3d359a80c6709089e0c.png
diff --git a/app/common/destiny_content/icons/627cfc5228f9c070d39bc54030dd46d6.png b/app/common/destiny_content/icons/627cfc5228f9c070d39bc54030dd46d6.png
diff --git a/app/common/destiny_content/icons/62c8c1ab583bd26959efd4805ef8ba9d.png b/app/common/destiny_content/icons/62c8c1ab583bd26959efd4805ef8ba9d.png
diff --git a/app/common/destiny_content/icons/69138042fa8a925931408f79c9bfe137.png b/app/common/destiny_content/icons/69138042fa8a925931408f79c9bfe137.png
diff --git a/app/common/destiny_content/icons/6b2f16a8c7098a5e8211288a73bfb53d.png b/app/common/destiny_content/icons/6b2f16a8c7098a5e8211288a73bfb53d.png
diff --git a/app/common/destiny_content/icons/6c75a4b0bc19c6c311c6eb502a04c84c.png b/app/common/destiny_content/icons/6c75a4b0bc19c6c311c6eb502a04c84c.png
diff --git a/app/common/destiny_content/icons/6cc617871378c3508a2ad5c71bef783e.png b/app/common/destiny_content/icons/6cc617871378c3508a2ad5c71bef783e.png
diff --git a/app/common/destiny_content/icons/70f67eadc3394b849ee12644d4d5e7b6.png b/app/common/destiny_content/icons/70f67eadc3394b849ee12644d4d5e7b6.png
diff --git a/app/common/destiny_content/icons/7b6ee7d238bfc612d4cdff480d6da90c.png b/app/common/destiny_content/icons/7b6ee7d238bfc612d4cdff480d6da90c.png
diff --git a/app/common/destiny_content/icons/89b2e6686b82c0a94763eae0b8ace393.png b/app/common/destiny_content/icons/89b2e6686b82c0a94763eae0b8ace393.png
diff --git a/app/common/destiny_content/icons/8e11f2351a9565004ff523ff737ce4ae.png b/app/common/destiny_content/icons/8e11f2351a9565004ff523ff737ce4ae.png
diff --git a/app/common/destiny_content/icons/925fa82b9ce2f52c65fccf7c61d21ea8.png b/app/common/destiny_content/icons/925fa82b9ce2f52c65fccf7c61d21ea8.png
diff --git a/app/common/destiny_content/icons/9355e576799c45a12c809807a06b85e2.png b/app/common/destiny_content/icons/9355e576799c45a12c809807a06b85e2.png
diff --git a/app/common/destiny_content/icons/af371bed2489ba0a30423735e43e383f.png b/app/common/destiny_content/icons/af371bed2489ba0a30423735e43e383f.png
diff --git a/app/common/destiny_content/icons/b19aaae5ffcb91e644d8a232a5b4650e.png b/app/common/destiny_content/icons/b19aaae5ffcb91e644d8a232a5b4650e.png
diff --git a/app/common/destiny_content/icons/b607080076055de12d89fd09147a27b2.png b/app/common/destiny_content/icons/b607080076055de12d89fd09147a27b2.png
diff --git a/app/common/destiny_content/icons/c08b1d9aab290896ecc8bcd70a9ce3c7.png b/app/common/destiny_content/icons/c08b1d9aab290896ecc8bcd70a9ce3c7.png
diff --git a/app/common/destiny_content/icons/c4ad4df764c5684365c6400a3ee87063.png b/app/common/destiny_content/icons/c4ad4df764c5684365c6400a3ee87063.png
diff --git a/app/common/destiny_content/icons/c55b34e202eef403cbc05f833030f49c.png b/app/common/destiny_content/icons/c55b34e202eef403cbc05f833030f49c.png
diff --git a/app/common/destiny_content/icons/c99beaf30218ce2f574f00e9a27fe4eb.png b/app/common/destiny_content/icons/c99beaf30218ce2f574f00e9a27fe4eb.png
diff --git a/app/common/destiny_content/icons/cd18a45d77658540b96ff1a40c6c2a62.png b/app/common/destiny_content/icons/cd18a45d77658540b96ff1a40c6c2a62.png
diff --git a/app/common/destiny_content/icons/ce8567999f5ac50718b048e546f7511b.png b/app/common/destiny_content/icons/ce8567999f5ac50718b048e546f7511b.png
diff --git a/app/common/destiny_content/icons/d0b50ab7a2f461ef00173f45fafa6a31.png b/app/common/destiny_content/icons/d0b50ab7a2f461ef00173f45fafa6a31.png
diff --git a/app/common/destiny_content/icons/e117b85beb2ca26062005a246689f352.png b/app/common/destiny_content/icons/e117b85beb2ca26062005a246689f352.png
diff --git a/app/common/destiny_content/icons/e74086912d054ed886c3bd65b9597757.png b/app/common/destiny_content/icons/e74086912d054ed886c3bd65b9597757.png
diff --git a/app/common/destiny_content/icons/ebfa449a049659ffdeecbdc6e9b9d41f.png b/app/common/destiny_content/icons/ebfa449a049659ffdeecbdc6e9b9d41f.png
diff --git a/app/common/destiny_content/icons/f3ebcf527fa41237968708dd2a003a68.png b/app/common/destiny_content/icons/f3ebcf527fa41237968708dd2a003a68.png
diff --git a/app/common/destiny_content/icons/f8689080d1a74d7276f1732cc1da385c.png b/app/common/destiny_content/icons/f8689080d1a74d7276f1732cc1da385c.png
diff --git a/app/common/destiny_content/icons/fd59fce0658308011fc6f359ef5e0689.png b/app/common/destiny_content/icons/fd59fce0658308011fc6f359ef5e0689.png
diff --git a/app/common/destiny_content/icons/ffe4372ff3edd4de40ef12a8d32db0af.png b/app/common/destiny_content/icons/ffe4372ff3edd4de40ef12a8d32db0af.png
diff --git a/app/index.html b/app/index.html
@@ -4,7 +4,7 @@
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>DIM v3.3</title>
+ <title>DIM v3.3.1</title>
  <meta name="description" content="">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
@@ -40,64 +40,64 @@
  <div id="content" ui-view></div>
  </div>
 
- <script src="scripts/google.js?v=3.3"></script>
+ <script src="scripts/google.js?v=3.3.1"></script>
 
  <!-- begin vendor scripts -->
- <script src="vendor/jquery/dist/jquery.min.js?v=3.3"></script>
- <script src="vendor/angular/angular.min.js?v=3.3"></script>
- <script src="vendor/angular-ui-router/release/angular-ui-router.min.js?v=3.3"></script>
- <script src="vendor/angular-animate/angular-animate.min.js?v=3.3"></script>
- <script src="scripts/toaster.js?v=3.3"></script>
- <script src="vendor/angular-native-dragdrop/draganddrop.js?v=3.3"></script>
- <script src="vendor/ngDialog/js/ngDialog.min.js?v=3.3"></script>
- <script src="vendor/Angular.uuid2/dist/angular-uuid2.min.js?v=3.3"></script>
- <script src="vendor/underscore/underscore-min.js?v=3.3"></script>
- <script src="vendor/lz-string/libs/lz-string.min.js?v=3.3"></script>
- <script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.3"></script>
- <script src="vendor/angular-messages/angular-messages.min.js?v=3.3"></script>
- <script src="vendor/angular-promise-tracker/promise-tracker.js?v=3.3"></script>
+ <script src="vendor/jquery/dist/jquery.min.js?v=3.3.1"></script>
+ <script src="vendor/angular/angular.min.js?v=3.3.1"></script>
+ <script src="vendor/angular-ui-router/release/angular-ui-router.min.js?v=3.3.1"></script>
+ <script src="vendor/angular-animate/angular-animate.min.js?v=3.3.1"></script>
+ <script src="scripts/toaster.js?v=3.3.1"></script>
+ <script src="vendor/angular-native-dragdrop/draganddrop.js?v=3.3.1"></script>
+ <script src="vendor/ngDialog/js/ngDialog.min.js?v=3.3.1"></script>
+ <script src="vendor/Angular.uuid2/dist/angular-uuid2.min.js?v=3.3.1"></script>
+ <script src="vendor/underscore/underscore-min.js?v=3.3.1"></script>
+ <script src="vendor/lz-string/libs/lz-string.min.js?v=3.3.1"></script>
+ <script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.3.1"></script>
+ <script src="vendor/angular-messages/angular-messages.min.js?v=3.3.1"></script>
+ <script src="vendor/angular-promise-tracker/promise-tracker.js?v=3.3.1"></script>
  <!-- end vendor scripts -->
 
- <script src="scripts/ScrollToFixed.js?v=3.3"></script>
- <script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.3"></script>
- <script src="vendor/angular-cookies/angular-cookies.js?v=3.3"></script>
- <script src="vendor/angular-hotkeys/build/hotkeys.js?v=3.3"></script>
+ <script src="scripts/ScrollToFixed.js?v=3.3.1"></script>
+ <script src="vendor/angular-chrome-storage/angular-chrome-storage.js?v=3.3.1"></script>
+ <script src="vendor/angular-cookies/angular-cookies.js?v=3.3.1"></script>
+ <script src="vendor/angular-hotkeys/build/hotkeys.js?v=3.3.1"></script>
 
  <!-- begin app scripts -->
- <script src="scripts/dimApp.module.js?v=3.3"></script>
- <script src="scripts/dimApp.config.js?v=3.3"></script>
- <script src="scripts/dimWebWorker.factory.js?v=3.3"></script>
- <script src="scripts/services/dimRateLimit.factory.js?v=3.3"></script>
- <script src="scripts/services/dimBungieService.factory.js?v=3.3"></script>
- <script src="scripts/services/dimDefinitions.factory.js?v=3.3"></script>
- <script src="scripts/services/dimPlatformService.factory.js?v=3.3"></script>
- <script src="scripts/services/dimLoadoutService.factory.js?v=3.3"></script>
- <script src="scripts/services/dimSettingsService.factory.js?v=3.3"></script>
- <script src="scripts/services/dimStoreService.factory.js?v=3.3"></script>
- <script src="scripts/services/dimItemService.factory.js?v=3.3"></script>
- <script src="scripts/loadout/dimLoadout.directive.js?v=3.3"></script>
- <script src="scripts/loadout/dimLoadoutPopup.directive.js?v=3.3"></script>
- <script src="scripts/shell/dimAppCtrl.controller.js?v=3.3"></script>
- <script src="scripts/shell/dimSettingsCtrl.controller.js?v=3.3"></script>
- <script src="scripts/shell/dimPlatformChoice.directive.js?v=3.3"></script>
- <script src="scripts/shell/dimSearchFilter.directive.js?v=3.3"></script>
- <script src="scripts/shell/dimClickAnywhereButHere.directive.js?v=3.3"></script>
- <script src="scripts/store/dimStores.directive.js?v=3.3"></script>
- <script src="scripts/store/dimStoreItems.directive.js?v=3.3"></script>
- <script src="scripts/store/dimStoreItem.directive.js?v=3.3"></script>
- <script src="scripts/store/dimStoreHeading.directive.js?v=3.3"></script>
- <script src="scripts/move-popup/dimMovePopup.directive.js?v=3.3"></script>
- <script src="scripts/move-popup/dimTalentGrid.directive.js?v=3.3"></script>
- <script src="scripts/move-popup/dimMoveItemProperties.directive.js?v=3.3"></script>
- <script src="scripts/infuse/dimInfuse.util.js?v=3.3"></script>
- <script src="scripts/infuse/dimInfuseItem.directive.js?v=3.3"></script>
- <script src="scripts/infuse/dimInfuse.controller.js?v=3.3"></script>
+ <script src="scripts/dimApp.module.js?v=3.3.1"></script>
+ <script src="scripts/dimApp.config.js?v=3.3.1"></script>
+ <script src="scripts/dimWebWorker.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimRateLimit.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimBungieService.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimDefinitions.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimPlatformService.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimLoadoutService.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimSettingsService.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimStoreService.factory.js?v=3.3.1"></script>
+ <script src="scripts/services/dimItemService.factory.js?v=3.3.1"></script>
+ <script src="scripts/loadout/dimLoadout.directive.js?v=3.3.1"></script>
+ <script src="scripts/loadout/dimLoadoutPopup.directive.js?v=3.3.1"></script>
+ <script src="scripts/shell/dimAppCtrl.controller.js?v=3.3.1"></script>
+ <script src="scripts/shell/dimSettingsCtrl.controller.js?v=3.3.1"></script>
+ <script src="scripts/shell/dimPlatformChoice.directive.js?v=3.3.1"></script>
+ <script src="scripts/shell/dimSearchFilter.directive.js?v=3.3.1"></script>
+ <script src="scripts/shell/dimClickAnywhereButHere.directive.js?v=3.3.1"></script>
+ <script src="scripts/store/dimStores.directive.js?v=3.3.1"></script>
+ <script src="scripts/store/dimStoreItems.directive.js?v=3.3.1"></script>
+ <script src="scripts/store/dimStoreItem.directive.js?v=3.3.1"></script>
+ <script src="scripts/store/dimStoreHeading.directive.js?v=3.3.1"></script>
+ <script src="scripts/move-popup/dimMovePopup.directive.js?v=3.3.1"></script>
+ <script src="scripts/move-popup/dimTalentGrid.directive.js?v=3.3.1"></script>
+ <script src="scripts/move-popup/dimMoveItemProperties.directive.js?v=3.3.1"></script>
+ <script src="scripts/infuse/dimInfuse.util.js?v=3.3.1"></script>
+ <script src="scripts/infuse/dimInfuseItem.directive.js?v=3.3.1"></script>
+ <script src="scripts/infuse/dimInfuse.controller.js?v=3.3.1"></script>
  <!-- end app scripts -->
 
  <script src="scripts/3d-falling-leaves.js" type="text/javascript"></script>
  <script src="scripts/rotate3Di.js" type="text/javascript"></script>
 
- <!-- <script src="scripts/scripts.min.js?v=3.3"></script> -->
+ <!-- <script src="scripts/scripts.min.js?v=3.3.1"></script> -->
 
  <style>
  .crimson .october-leaf {

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 2,
  "name": "Destiny Item Manager",
- "version": "3.3",
+ "version": "3.3.1",
  "description": "Robust interface to manage gear, weapons, and items in Destiny.",
  "icons": {
  "16": "icon16.png",

diff --git a/app/scripts/api-manifest/items.json b/app/scripts/api-manifest/items.json
diff --git a/app/scripts/api-manifest/perks.json b/app/scripts/api-manifest/perks.json
diff --git a/app/scripts/api-manifest/stats.json b/app/scripts/api-manifest/stats.json
diff --git a/app/scripts/api-manifest/talent.json b/app/scripts/api-manifest/talent.json
diff --git a/app/scripts/services/dimDefinitions.factory.js b/app/scripts/services/dimDefinitions.factory.js
@@ -20,7 +20,7 @@
  _.each(definitions, function(file, name) {
  var factory = function($http) {
  //console.time("loading " + name);
- return $http.get('scripts/api-manifest/' + file + '.json?v=3.3')
+ return $http.get('scripts/api-manifest/' + file + '.json?v=3.3.1')
  .then(function(json) {
  //console.timeEnd("loading " + name);
  return json.data;

diff --git a/app/views/about.html b/app/views/about.html
@@ -1,6 +1,6 @@
 <div dim-about dim-click-anywhere-but-here="app.closeLoadoutPopup()">
  <h1 class="orange">About Destiny Item Manager (DIM)</h1>
- <h3>Version 3.3</h3>
+ <h3>Version 3.3.1</h3>
  <p>
  DIM is built upon the same services used by Bungie.net and the Destiny Companion App. DIM can access the items within your Guardians inventory and the Vault for both PlayStation and Xbox. You then can drag and drop items anywhere you wish to move them.
  </p>

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
  "name": "dim",
  "description": "An item manager for Destiny.",
- "version": "3.3",
+ "version": "3.3.1",
  "homepage": "https://github.com/DestinyItemManager/DIM",
  "repository": {
  "type": "git",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "dim",
- "version": "3.3",
+ "version": "3.3.1",
  "description": "An item manager for Destiny.",
  "main": "app/index.html",
  "scripts": {