AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-29 16:03:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,983 Commits 29 Branches 143 Tags
Commit Graph

3983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vexatos
6115617ce0 Update oppm.lua 2015-03-30 09:53:49 +02:00
Florian Nücke
75668a5e62 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/machine/Machine.scala
 2015-03-30 02:03:01 +02:00
Florian Nücke
d13cdc0cd8 Somewhat experimental fix for memory leaks seen in Microcontrollers. If you notice any new issues after this, please do let me know. 
This essentially schedules machines for full cleanup at a later point, to allow executor threads to finish (can't close states while they're running, don't want to wait for them to finish to avoid lagging servers).
 2015-03-29 22:45:43 +02:00
Florian Nücke
5e9861d04a Temporarily disabling AE2 integration for rv2-beta-20 and newer due to methods that were deprecated in the API crashing now. 2015-03-29 13:24:43 +02:00
Florian Nücke
d2d51b9122 Because the compiler told me to. 2015-03-29 13:23:08 +02:00
Florian Nücke
fba95389be Should fix #976. 2015-03-29 01:35:34 +01:00
Florian Nücke
27a63e319b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-27 21:51:39 +01:00
Florian Nücke
fa5a6f14b0 Might make #973 go away. 2015-03-27 19:25:39 +01:00
Florian Nücke
ef6d251c30 Oops, that went directly into the stable branch earlier. 2015-03-27 15:52:22 +01:00
Florian Nücke
ebeb1ff5d5 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-03-27 14:36:02 +01:00
Florian Nücke
e0989ec2e4 Adjusted ISidedInventory implementation for MC1.8. 2015-03-26 18:48:36 +01:00
Florian Nücke
2302d7b66f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-26 18:47:32 +01:00
Florian Nücke
b6d20aa344 Made printer easier to automate (piping out of it will now only extract "outputs", i.e. empty ink cartridges and prints). 2015-03-26 18:47:13 +01:00
Florian Nücke
389e52b6e1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
 2015-03-26 16:44:45 +01:00
Florian Nücke
1bfd54091a Made save format for 3D printed shapes more compact. 
Old format can still be loaded.
 2015-03-26 16:40:11 +01:00
Florian Nücke
25df6de3d4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/util/ExtendedBlock.scala
 2015-03-26 14:48:41 +01:00
Florian Nücke
c80adbb23c Made block detection for agents more detailed, checking for "passable" blocks (ones without collision bounds). Closes #972. 2015-03-26 13:57:50 +01:00
Florian Nücke
52deb48670 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-26 07:40:12 +01:00
Florian Nücke
6ce2256b0f Fixed assembler only working if more than a certain amount of energy was available. 
Fixed bug in energy change logic.
 2015-03-26 07:39:52 +01:00
Florian Nücke
2be8d20046 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/Print.scala
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
 2015-03-26 07:18:14 +01:00
Florian Nücke
ff2ca21edb Added FMP compatibility to 3D prints \o/ 2015-03-26 07:09:45 +01:00
Florian Nücke
069f271474 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-26 01:17:23 +01:00
Florian Nücke
2af6242086 Improved printer's progress bar behavior a bit more. 
Increased max shapes per print state to 24.
 2015-03-26 00:56:57 +01:00
Florian Nücke
5d4fb7a101 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-03-25 22:43:27 +01:00
Florian Nücke
3e72a08017 Made the "progress" arrow in the printer GUI correspond to actual completion progress. 
Increased energy required for a single print.
 2015-03-25 22:43:09 +01:00
Florian Nücke
5ffd37f0e9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Printer.scala
	src/main/scala/li/cil/oc/common/tileentity/Print.scala
 2015-03-25 19:41:54 +01:00
Florian Nücke
04e305bea6 Fixed printer printing a model even if limit is set to zero. 
Some cleanup.
 2015-03-25 19:40:35 +01:00
Florian Nücke
eb534f828a Made texture picker work again... somewhat (not side-aware, but hey). 2015-03-25 19:39:21 +01:00
Florian Nücke
68fc33bd41 Fixed rotatability of prints. 2015-03-25 19:27:10 +01:00
Florian Nücke
7f40275e19 Fixed rendering of all (?) the things. 2015-03-25 19:08:30 +01:00
Florian Nücke
38b251f70c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/Print.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/block/Print.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-03-25 18:13:38 +01:00
Florian Nücke
561552c7fa Proper rendering for 3D printer, started rendering of 3D prints. 2015-03-25 18:08:10 +01:00
Florian Nücke
2ccc4b9bec Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/gui/widget/ProgressBar.scala
	src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/block/traits/CustomDrops.scala
	src/main/scala/li/cil/oc/common/container/Assembler.scala
	src/main/scala/li/cil/oc/common/container/Disassembler.scala
	src/main/scala/li/cil/oc/common/container/Switch.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
 2015-03-25 16:57:33 +01:00
Florian Nücke
5503e3e283 Fixed isSolid check on rotated prints. 2015-03-25 11:09:01 +01:00
Florian Nücke
0a9839b0f2 Made graphic for material indicator bar in printer GUI darker to make it more visible. 2015-03-25 10:54:47 +01:00
Florian Nücke
50b496af2c Fixed potential flickering in print item rendering, the lazy way. 2015-03-25 10:46:16 +01:00
Florian Nücke
26ad22e990 Fixed Chamelium block drops / picking. 2015-03-25 10:37:01 +01:00
Florian Nücke
869f1380ac Allow crafting prints with blocks of iron/gold/emerald/diamond blocks to create a beacon base capable print, as suggested by DeathRtH via Kodos. 2015-03-25 10:28:33 +01:00
Florian Nücke
2757733944 Added Chamelium block, mostly for the clean texture to use in prints. 2015-03-25 10:04:59 +01:00
Florian Nücke
238436a68b Fixed mv.lua deleting source file even if target already exists. Closes #971. 2015-03-25 08:58:30 +01:00
Florian Nücke
a829a7f64a Allow applying tint to shapes of 3d prints. 2015-03-25 01:58:32 +01:00
Florian Nücke
b9b7f41884 Added limiting to number of blocks printed, defaults to one, optional parameter to printer3d.commit(). 2015-03-24 22:37:19 +01:00
Florian Nücke
f150db952e Fixed build (y u no tell me dis stuff IntelliJ...) 2015-03-24 18:34:47 +01:00
Florian Nücke
2de2049a2f Recipe for printer. 2015-03-24 18:19:11 +01:00
Florian Nücke
6eafc4996d Bump version. 2015-03-24 17:17:05 +01:00
Florian Nücke
6ccf328752 Merge branch '3d-printer' into master-MC1.7.10 
Conflicts:
	src/main/resources/application.conf
	src/main/scala/li/cil/oc/Settings.scala
 2015-03-24 17:16:42 +01:00
Florian Nücke
ab7e371fe1 Fixed isSolid check in 3d prints. Made Z in shape declaration go to the back to make it more intuitive. 2015-03-24 16:44:53 +01:00
Florian Nücke
72c73f4cc7 Added tool to display block texture names, for use in 3D shape definitions. 2015-03-24 16:02:42 +01:00
Florian Nücke
fe68cb7759 Default missing texture texture for missing textures. 2015-03-24 15:39:45 +01:00
Florian Nücke
e0645f061c Increase max label length a little. 2015-03-24 15:19:10 +01:00