AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-23 12:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,044 Commits 29 Branches 143 Tags
Commit Graph

5044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
474795dd41 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/mcmp/MCMultiPart.scala
 2016-05-27 16:17:08 +02:00
Florian Nücke
f1c1c064ae What do you mean, access to client classes on a server? :P 2016-05-27 16:14:31 +02:00
Florian Nücke
898ba62d09 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-05-27 15:27:28 +02:00
Florian Nücke
030ebb518d This is way more weird than I thought... 2016-05-27 15:27:14 +02:00
Florian Nücke
a031b167ea Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/Loot.scala
 2016-05-27 15:14:41 +02:00
Florian Nücke
ef59cd513f Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/Loot.scala
#	src/main/scala/li/cil/oc/server/component/DataCard.scala
#	src/main/scala/li/cil/oc/server/component/InternetCard.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala
 2016-05-27 15:13:44 +02:00
Florian Nücke
ae92c73a91 Why IntelliJ, whyyyy? D: 2016-05-27 15:11:57 +02:00
Florian Nücke
ba59e9493f JEI integration for loot disk recrafting (more or less :P). 2016-05-27 15:07:28 +02:00
Florian Nücke
b03ce8bf3d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-27 14:34:48 +02:00
Florian Nücke
0990c09274 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/Loot.scala
#	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
#	src/main/scala/li/cil/oc/server/component/InternetCard.scala
 2016-05-27 14:34:37 +02:00
Florian Nücke
4737520b6a Recipe sorting. 2016-05-27 14:34:08 +02:00
Florian Nücke
896bfa2728 Cleanup. 2016-05-27 13:43:15 +02:00
Florian Nücke
b50d3872ee Moved all the things! Renamed all the things! Broke all the things! 
Made most component ROMs into loot disks (except robot for hopefully obvious reasons).
Changed loot disk naming convention (this will break existing loot disks). Closes #1456.
Made all loot disks craftable by cycling through them by crafting one with a wrench (so e.g. craft OpenOS then cycle through).
 2016-05-27 13:33:22 +02:00
Florian Nücke
a93fb7f78e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Printer.scala
#	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
#	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
#	src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
 2016-05-26 20:00:42 +02:00
Florian Nücke
7eca6c1a10 Fix lighting issues with print preview in 3d printer. 2016-05-26 19:57:30 +02:00
Florian Nücke
ea37f4db67 Not all things must tick. 2016-05-26 17:34:37 +02:00
Florian Nücke
5624b88151 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala
#	src/main/scala/li/cil/oc/util/RenderState.scala
 2016-05-26 11:55:56 +02:00
Florian Nücke
726aa36164 Wrap push/popAttrib, don't for now, since it breaks the GlStateManager. 2016-05-26 11:54:53 +02:00
Florian Nücke
2d53f0ce71 Workaround for obfuscation issue leading to AbstractMethodError. 2016-05-25 19:32:45 +02:00
Florian Nücke
cf7ce65a96 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-05-25 18:34:15 +02:00
Florian Nücke
41f51337b0 Porting. 2016-05-25 18:34:01 +02:00
Florian Nücke
bc1107e5cb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-25 18:33:33 +02:00
Florian Nücke
6e271c79d8 Update player last active time to avoid AFK kicks while working in screens e.g. Closes #1811. 2016-05-25 18:33:15 +02:00
Florian Nücke
802ba1eee3 1.9.4 2016-05-25 18:20:26 +02:00
Florian Nücke
dd973ae1ab Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	build.properties
 2016-05-25 18:19:00 +02:00
Florian Nücke
fa226ab118 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-25 18:17:14 +02:00
Florian Nücke
3e8e94afa1 Update JEI. 2016-05-25 18:07:44 +02:00
Florian Nücke
0817c6de08 Fixed swapping EEPROMs in MCUs. Closes #1814. 2016-05-25 18:07:07 +02:00
payonel
c819466b04 simplify term hint text indexing and fix lua prompt hint handler 2016-05-24 19:04:33 -07:00
Florian Nücke
7efbb428bf Store whether tag was written for server or client, so we know how to load it, since the client may feed use either now... 
Fixed triggering of some sounds.
Also constantify all the tag names .-.
 2016-05-21 17:10:09 +02:00
Florian Nücke
7cdf378fd9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-21 13:44:37 +02:00
Florian Nücke
9e21c3d4f5 Fix setResolution return false even when the resolution changed, closes #1809. 2016-05-21 13:44:14 +02:00
Florian Nücke
e5b6ea9bb2 Initial portering to 1.9.4. 
MCMP integration is kinda derpy still (prints don't render correctly when multiparts).
 2016-05-20 18:19:29 +02:00
Florian Nücke
378aa8f09b Should fix #1807. 2016-05-16 20:01:18 +02:00
Florian Nücke
a7a18e0488 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 2016-05-14 23:28:34 +02:00
Florian "Sangar" Nücke
feedf21757 Merge pull request #1806 from Vexatos/master-MC1.8.9 
Fixed hover boots texture
 2016-05-14 23:28:08 +02:00
Florian Nücke
1d240888c3 Updated MCMP integration. Closes #1803. 2016-05-14 23:27:50 +02:00
Vexatos
df5ea067c9 Fixed hover boots texture. 2016-05-14 17:49:06 +02:00
Florian Nücke
2db2a5a5f8 Pass along hand and heldItem in RackMountable.onActivate. Closes #1798. 2016-05-14 14:42:12 +02:00
Florian Nücke
c19451c77a Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Rack.scala
#	src/main/scala/li/cil/oc/common/component/TerminalServer.scala
 2016-05-14 14:28:29 +02:00
Florian Nücke
39a2372705 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/component/RackMountable.java
#	src/main/scala/li/cil/oc/common/block/Rack.scala
#	src/main/scala/li/cil/oc/common/component/TerminalServer.scala
#	src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala
#	src/main/scala/li/cil/oc/server/component/Server.scala
 2016-05-14 14:18:23 +02:00
Florian Nücke
a21bb1ce3b Might fix #1805. 2016-05-14 14:02:10 +02:00
Florian Nücke
cdd59cff05 Initialize components in client tile entities when loading / receiving description packet. Should fix #1801. 2016-05-14 13:59:31 +02:00
Florian Nücke
ca5d95cff5 Only pass X and Y to RackMountable.onActivate, adjusted to the actual surface area of the mountable (in [0, 1] for both, on the 14x3 pixel surface). Closes #1794. 2016-05-14 13:23:11 +02:00
Florian Nücke
42f6cbe50c Oh look, method name change. 2016-05-13 19:42:39 +02:00
Florian Nücke
34c5d02fd1 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 2016-05-13 19:40:39 +02:00
Florian Nücke
b8ac9976df Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2016-05-13 19:40:18 +02:00
Florian Nücke
af07508587 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-05-13 19:30:19 +02:00
Florian Nücke
6a40619696 Fix robots being able to drain from flowing liquid blocks... closes #1796. 
Seriously? Did flowing liquids always magically convert from BlockDynamicLiquid into BlockStaticLiquid after a while? Meta checks? Ugh...
 2016-05-13 19:27:59 +02:00
Florian Nücke
da1dbecae9 Should fix generator upgrade eating container items if they're not taken out in time. Closes #1779. 2016-05-13 18:39:07 +02:00