Commit Graph
3961 Commits
Author SHA1 Message Date
aidancbrady 738c5c8ba6 Merge branch '1.10'
* 1.10:
  Bump version to 9.1.1
  Fixed IC2 crash
  Fixed Infusing Factory losing infuse storage, implement CTM model caching
  Fix rendering of handheld items
  Fixed Tesla mod ID
  Update Tesla API, render fixes
  Fixed some rendering issues
  Fixed EnergyAcceptorWrapper crash
  Fixed Atomic Disassembler attack speed
  Fixed CME when checking recipes
  Fixed Digital Miner text scaling, fixed MCMP version, fixed Digital Miner crash
  Better Creative Energy Cube config
  Added a NONE TransformType check
  Add proper crash check
  Restrict Thermal Evaporation Plant output to needed
  Fix rendering crashes
2016-08-05 21:28:45 -04:00
aidancbrady a9177a0989 Bump version to 9.1.1 2016-08-05 21:28:23 -04:00
aidancbrady 770e127a75 Fixed IC2 crash 2016-08-05 20:45:40 -04:00
aidancbrady f00b35a017 Fixed Infusing Factory losing infuse storage, implement CTM model caching 2016-08-05 16:44:30 -04:00
aidancbrady 19453b56f3 Fix rendering of handheld items 2016-08-04 15:35:46 -04:00
aidancbrady a4a335a8b9 Fixed Tesla mod ID 2016-08-04 15:21:49 -04:00
aidancbrady 309ed88a1e Update Tesla API, render fixes 2016-08-04 15:19:36 -04:00
aidancbrady fa871c55f0 Fixed some rendering issues 2016-08-03 19:48:42 -05:00
aidancbrady 6c8e932340 Fixed EnergyAcceptorWrapper crash 2016-08-03 19:39:39 -05:00
aidancbrady cf9c9d0d50 Fixed Atomic Disassembler attack speed 2016-08-03 19:36:43 -05:00
aidancbrady 4a07cf961e Fixed CME when checking recipes 2016-08-03 19:26:51 -05:00
aidancbrady ff33572ff0 Fixed Digital Miner text scaling, fixed MCMP version, fixed Digital Miner crash 2016-08-03 19:19:52 -05:00
aidancbrady 38999f3647 Better Creative Energy Cube config 2016-07-28 12:36:15 -04:00
aidancbrady 1355bd11cd Added a NONE TransformType check 2016-07-25 18:55:54 -04:00
aidancbrady 27f0d9ce11 Add proper crash check 2016-07-23 23:35:59 -04:00
aidancbrady 62c0588722 Restrict Thermal Evaporation Plant output to needed 2016-07-23 23:11:32 -04:00
aidancbrady b62a858a4a Fix rendering crashes 2016-07-23 22:56:50 -04:00
aidancbrady 843c45c311 Merge branch '1.10'
* 1.10:
  Fixed Teleporter textures
  Fixed Precision Sawmill duplication
  Fixed capes :)
  Vsync Wind Generators to client refresh rate
  Check with security before using Configuration Card
  Fixed bounding block placement, fixed texture registration
  Fixed pipe crash, fixed Logistical Sorter render
2016-07-20 23:52:56 -04:00
aidancbrady fe2d34d888 Fixed Teleporter textures 2016-07-20 23:48:23 -04:00
aidancbrady dce74d4459 Fixed Precision Sawmill duplication 2016-07-20 23:47:51 -04:00
aidancbrady 7b38621f77 Fixed capes :) 2016-07-20 15:25:17 -04:00
aidancbrady ba50a947cd Vsync Wind Generators to client refresh rate 2016-07-20 15:04:27 -04:00
aidancbrady 95028f5732 Check with security before using Configuration Card 2016-07-20 14:44:44 -04:00
aidancbrady e8513f4dca Fixed bounding block placement, fixed texture registration 2016-07-20 14:42:21 -04:00
aidancbrady a0d2d2f505 Fixed pipe crash, fixed Logistical Sorter render 2016-07-20 14:32:33 -04:00
Aidan c6c0f816d7 Going back to MIT, thanks to the concerns of @bshelden and @asiekierka 2016-07-20 02:22:04 -04:00
aidancbrady d71bfaf90b Merge branch '1.10'
* 1.10:
  Actually fix loading hook
2016-07-19 20:49:00 -04:00
aidancbrady ce0b46b4cb Merge branch '1.9.4' into 1.10
* 1.9.4:
  Actually fix loading hook
2016-07-19 20:48:48 -04:00
aidancbrady 08be22355c Actually fix loading hook 2016-07-19 20:48:38 -04:00
aidancbrady b695a440a2 Merge branch '1.10'
* 1.10:
  Fixed loading hook
2016-07-19 20:41:23 -04:00
aidancbrady 302db5b0ba Merge branch '1.9.4' into 1.10
* 1.9.4:
  Fixed loading hook
2016-07-19 20:41:09 -04:00
aidancbrady a93701423b Fixed loading hook 2016-07-19 20:40:57 -04:00
aidancbrady d354a7844b Merge branch '1.10'
* 1.10:
  Fix mappings issue (hopefully)
  Update mappings
2016-07-19 19:49:23 -04:00
aidancbrady 648419b4cf Fix mappings issue (hopefully) 2016-07-19 19:46:36 -04:00
aidancbrady d55314e358 Update mappings 2016-07-19 19:44:21 -04:00
aidancbrady 916970c052 Merge branch '1.10'
* 1.10:
  Bump README to 1.10 on 1.10 branch
  Build fix?
  Official 1.10 port - updated IC2 API
2016-07-19 19:15:40 -04:00
aidancbrady 26b20504cd Merge branch 'master' into 1.9.4
* master:
  Updated license to prevent future misuse of Mekanism
2016-07-19 16:49:14 -04:00
aidancbrady 0d4d0d6122 Merge branch 'master' into 1.10
* master:
  Updated license to prevent future misuse of Mekanism
2016-07-19 16:48:57 -04:00
Aidan d1eff9c378 Updated license to prevent future misuse of Mekanism 2016-07-19 16:46:03 -04:00
aidancbrady fc1ff9e8f5 Merge branch '1.9.4' into 1.10
* 1.9.4:
  Removed println
  Wind Generators are now much more efficient
2016-07-19 15:53:07 -04:00
aidancbrady ceab621852 Merge branch '1.7.10' into 1.9.4
* 1.7.10:
  Removed println
  Wind Generators are now much more efficient

Conflicts:
	src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
	src/main/java/mekanism/generators/client/render/RenderWindGenerator.java
2016-07-19 15:52:34 -04:00
aidancbrady bc0bd80302 Removed println 2016-07-19 15:46:51 -04:00
aidancbrady a59ba334ba Wind Generators are now much more efficient 2016-07-19 15:43:09 -04:00
aidancbrady aa52a53537 Merge branch '1.9.4' into 1.10
* 1.9.4:
  Completed Opaque Transmitter implementation. Yay!
  Fix Reactor Ports, again
  Bump up Electrolytic Separator gas output
  Fixed Reactor Port crash
  compleatly replaced files
  removed the word "opaque" in all image names
  added boolean opaque
  added boolean opaque
  loaded config before Tier.init()
  added new opaque images
2016-07-19 15:19:37 -04:00
aidancbrady 51342603d4 Merge branch 'development' into 1.9.4
* development:
  Completed Opaque Transmitter implementation. Yay!
  Fix Reactor Ports, again
  Bump up Electrolytic Separator gas output
  Fixed Reactor Port crash
  compleatly replaced files
  removed the word "opaque" in all image names
  added boolean opaque
  added boolean opaque
  loaded config before Tier.init()
  added new opaque images

Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
	src/main/java/mekanism/common/multipart/PartPressurizedTube.java
	src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/multipart/TransmitterIcons.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-07-19 15:19:04 -04:00
aidancbrady 0ae477fd01 Completed Opaque Transmitter implementation. Yay! 2016-07-19 14:03:11 -04:00
Aidan 640de3ef4c Merge pull request #3493 from chaos234/opaque
Opaque
2016-07-19 13:41:53 -04:00
aidancbrady ceb1c37b00 Fix Reactor Ports, again 2016-07-19 13:35:48 -04:00
aidancbrady 6aa6591628 Bump up Electrolytic Separator gas output 2016-07-19 13:31:52 -04:00
aidancbrady c4ee63081f Fixed Reactor Port crash 2016-07-19 13:16:37 -04:00