[Pcgen-github] [PCGen/pcgen] 32f526: CODE-2830

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/PCGen/pcgen
  Commit: 32f526ea405381f2303b4b6333cf453fb70e82db
      https://github.com/PCGen/pcgen/commit/32f526ea405381f2303b4b6333cf453fb70e82db
  Author: Tom Parker <th...@ya...>
  Date:   2015-07-25 (Sat, 25 Jul 2015)

  Changed paths:
    M code/src/java/pcgen/cdom/enumeration/ObjectKey.java
    M code/src/java/pcgen/core/Equipment.java
    M code/src/java/pcgen/persistence/SourceFileLoader.java

  Log Message:
  -----------
  CODE-2830
- Fix Custom Equipment Load order


  Commit: 55d37bd743ed8ece5544a4c2a74b20794c2bc242
      https://github.com/PCGen/pcgen/commit/55d37bd743ed8ece5544a4c2a74b20794c2bc242
  Author: Tom Parker <th...@ya...>
  Date:   2015-07-25 (Sat, 25 Jul 2015)

  Changed paths:
    M code/src/java/pcgen/cdom/enumeration/ObjectKey.java
    M code/src/java/pcgen/core/Equipment.java
    M code/src/java/pcgen/io/PCGVer2Parser.java
    M code/src/java/pcgen/persistence/SourceFileLoader.java

  Log Message:
  -----------
  CODE-2830 Ensure equipment loaded from PCG has size (and thus weight)
applied correctly


  Commit: 5bcb3e558583b72041df8e29892ab7288b93335b
      https://github.com/PCGen/pcgen/commit/5bcb3e558583b72041df8e29892ab7288b93335b
  Author: thpr <th...@us...>
  Date:   2015-07-25 (Sat, 25 Jul 2015)

  Changed paths:
    M code/src/java/pcgen/cdom/enumeration/ObjectKey.java
    M code/src/java/pcgen/core/Equipment.java
    M code/src/java/pcgen/io/PCGVer2Parser.java
    M code/src/java/pcgen/persistence/SourceFileLoader.java

  Log Message:
  -----------
  Merge pull request #381 from thpr/CODE-2830

CODE-2830


Compare: https://github.com/PCGen/pcgen/compare/908fbc9dd9ae...5bcb3e558583