Files
Mekanism-Community-Edition/src/main/java/mekanism/common/tile/component
aidancbrady b40cd5c20e Merge branch '1.11' into 1.12
* 1.11:
  add a couple of comments [no-ci]
  add Anchor Upgrade to Entangleporter
  Store Quantum Entangleporter frequency (name and public/private only) in the itemstack when dismantled. Displayed in the sneak key info tooltip.
  Increase Entangleporter frequency to be able to store as much as ultimate tiers can transmit.
  static field access to Class access

Conflicts:
	src/main/java/mekanism/common/frequency/Frequency.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2017-08-05 19:43:27 -07:00
..
2017-07-23 18:02:49 -07:00
2017-08-05 17:50:38 +02:00
2017-08-05 18:12:45 +02:00