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

3647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
47b6b27884 A little less intense on material consumption. 2015-03-24 15:01:00 +01:00
Florian Nücke
652bf48478 Avoid inaccuracies on rotated prints (to make sure solid faces are still recognized as such, e.g. for placing levers/torches). 2015-03-24 14:59:29 +01:00
Florian Nücke
f9736a792a Fixed transmitting fill state (y u only short for progress bars MC). Using custom logic for synchronizing container data now. 
Tweaked power values a bit.
 2015-03-24 14:37:34 +01:00
Florian Nücke
4781f2be46 Added setting to allow specifying custom priority for worker threads. 2015-03-24 12:51:11 +01:00
Florian Nücke
9898428cc0 More fine-grained collision / bounding box logic for prints. 2015-03-24 03:13:12 +01:00
Florian Nücke
495ec3a869 Made prints rotatable around y axis. 2015-03-24 02:39:09 +01:00
Florian Nücke
a906759283 Cleanup. 2015-03-24 01:40:58 +01:00
Florian Nücke
3625626fe5 Textures and model for printer, nicer rendering. 
Inventory and item entity rendering for prints.
 2015-03-24 01:31:34 +01:00
Florian Nücke
d45cc724b5 Refactoring. 2015-03-24 00:03:01 +01:00
Florian Nücke
bdc006d31e Redstone logic for printed blocks. 2015-03-23 23:41:07 +01:00
Florian Nücke
311973e33e Materials for printing (plastic and ink). 2015-03-23 21:02:08 +01:00
Florian Nücke
1d7b6caa6f Printer block to allow printing 3d prints. 2015-03-23 17:58:41 +01:00
Florian Nücke
bb3456d86e Added block type with data driven model, stored in item stack. 2015-03-23 05:00:57 +01:00
Florian Nücke
799224e92b Also calling doCustomInit on client side. 2015-03-23 04:59:49 +01:00
Florian Nücke
21af1160df Fixes access to client-only method on server side... closes #969. 2015-03-22 13:22:09 +01:00