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

3485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
03dc770188 Fixed hologram block renderer. 2015-02-14 22:24:14 +01:00
Florian Nücke
5c541641f5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-14 21:46:42 +01:00
Florian "Sangar" Nücke
539bc81c84 Merge pull request #870 from tmpvaracc/patch-1 
Update robot.names
 2015-02-14 21:45:47 +01:00
tmpvaracc
8d4bacd985 Update robot.names 
Fixed alphabet order
 2015-02-13 23:26:05 -05:00
Łukasz Magiera
4cedbb41e7
Clean io mode for sh.lua 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-02-13 19:49:13 +01:00
Florian Nücke
b09cb024a0 More rendering glitch fixing... 2015-02-13 18:03:01 +01:00
Florian Nücke
a3274bc7de Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-02-13 17:48:19 +01:00
Florian Nücke
82e57b507b Made third container in creative robot a disk drive, and added one to creative tablet. 2015-02-13 17:44:23 +01:00
Florian Nücke
6e4debf72b Underped MCU and Access Points' outer component nodes a little. 
This also means MCU is now network visible again.
 2015-02-13 16:10:06 +01:00
Florian Nücke
62afa212d5 This one's for @Vexatos. 2015-02-13 14:59:59 +01:00
Florian Nücke
d1397106ba Manually switching Lua locale to "C" for common number formatting on all systems, closes #800. 2015-02-13 14:56:53 +01:00
Florian Nücke
36056d39bd Guava hashing because it's more readable IMHO. 2015-02-13 14:47:30 +01:00
Florian Nücke
a6dcbca292 Merge branch 'world-converter' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-13 14:44:35 +01:00
Florian Nücke
a648b1f250 Added not to machines' power button to use an analyzer on errors. Closes #896. 2015-02-13 14:07:06 +01:00
Florian Nücke
36ab91cdac Workaround for Mystcraft not updating total world time in client worlds. 2015-02-13 13:52:48 +01:00
Florian Nücke
29f55d8a04 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-13 13:45:52 +01:00
Florian Nücke
f7ae4bff83 Fixed leash render hook. 2015-02-13 13:45:14 +01:00
Florian Nücke
5750ec8ba1 Should fix #911, merging networks containing nodes with the same address could lead to errors if these nodes had Visibility.None. 2015-02-13 13:30:41 +01:00
Florian Nücke
4da73d42ba Fixed tablet block highlight. 2015-02-12 17:18:59 +01:00
Florian Nücke
2129fef8db Screw it, routing all the GL state stuff through own class, forcing state changes in addition to calling GlStateManager. 
Its caching is just too horribad (and I'm pretty sure that's not me anymore; aside from that, other mods may mess up the state, too, and then everything goes down the drain anyway).
 2015-02-12 17:05:13 +01:00
Florian Nücke
1ded875cbc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/OpenComponentsPresentException.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
 2015-02-12 17:03:35 +01:00
Florian Nücke
ec2bca401c Fallback to to-stringing values when pushing them to Lua instead of yielding null. 
Should make it easier to track down missing converters and work well as a default for many things (e.g. ResourceLocations).
 2015-02-12 15:49:32 +01:00
Florian Nücke
970ca688d9 Removed OpenComponents check, it's done its due, I think. 2015-02-12 15:49:18 +01:00
Florian Nücke
284c4fd3d0 Minor rendering tweaks. 2015-02-12 00:49:20 +01:00
Florian Nücke
22759e827b Server rack block rendering. 2015-02-11 23:57:53 +01:00
Florian Nücke
bcf7fc4235 Centering keyboard when rendered in GUI. 2015-02-11 19:22:34 +01:00
Florian Nücke
a28275e240 Robot rendering in inventory. 2015-02-11 19:12:09 +01:00
Florian Nücke
f547cb6f1f Cable (and general) rendering improvements (fixed some orientation for AO. 2015-02-11 17:58:18 +01:00
Florian Nücke
707a5c728c Pulling a bunch of constants (item and block names for now) into a single class. 
Minor rendering adjustments after updating Forge version.
 2015-02-11 15:58:11 +01:00
Ben Blank
1629401916 hash dimension ID with world seed to obscure it 2015-02-10 17:12:03 -08:00
Florian Nücke
e93546feac Fixed block break texture of a few blocks. 2015-02-10 21:32:05 +01:00
Florian Nücke
1936b1989f Fixed iron ingot icon. 2015-02-10 02:47:49 +01:00
Florian Nücke
b526d07079 GlRenderState all the things, fixing a couple of rendering glitches. 2015-02-10 02:37:09 +01:00
Florian Nücke
b2c30e34bc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/Assembler.scala
	src/main/scala/li/cil/oc/client/gui/Disassembler.scala
	src/main/scala/li/cil/oc/client/gui/Raid.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-02-10 02:34:55 +01:00
Florian Nücke
43edfefa6e Potential rendering improvements (mostly stuff discovered while porting to 1.8 that didn't seem to have an effect in 1.7, but can't hurt to clean up). 2015-02-10 02:32:55 +01:00
Florian Nücke
66763c3317 Fixed robot inventory slot range. 2015-02-10 02:32:14 +01:00
Florian Nücke
c05b4fc3d6 Fixed potential NPE in MCU tooltip. 2015-02-10 02:27:34 +01:00
Florian Nücke
279f87a2b9 Fixed cables having a chance to not yielding outputs when being disassembled. 2015-02-10 02:26:21 +01:00
Florian Nücke
d366618836 Fixes creative tab crashing. 2015-02-10 00:04:17 +01:00
Florian Nücke
47c8448c7e Disabled state self-test because that seems to crash in obf'ed MC. 2015-02-09 23:54:10 +01:00
Florian Nücke
6a2ae319dd 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/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Colored.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/util/ExtendedBlock.scala
 2015-02-09 23:03:26 +01:00
Florian Nücke
d4b5a6e7db Changed tablet block interaction a bit, closes #905. 
When doing a "short" right click, tablets will behave as before, i.e. shift-right-click opens their GUI, normal right-click will either activate a block or open the GUI. To "analyze" a block, you'll now have to hold the right mouse button for half a second (or whatever it is you use to draw your bow). This will work when sneaking or not, also allowing inspection of blocks that'd otherwise open their GUI (like chests) or do stuff (like levers).
 2015-02-09 20:24:31 +01:00
Florian Nücke
30e37daba6 Merge branch 'recursive-flatten' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-09 16:20:13 +01:00
Florian Nücke
eec36e94ec Testing method for value conversion and userdata. 2015-02-09 16:19:46 +01:00
Florian Nücke
0e887eb3cc Fixed component node in MCU not being saved properly. 2015-02-09 13:34:03 +01:00
Florian Nücke
43a40cd3a8 Ensure writeToNBT/readFromNBT is only called on the server, as some mods may choose to call it on the client... 2015-02-09 13:30:14 +01:00
Florian Nücke
dab5a56def Added missing check for whether tablet actually can be charged. Closes #902. 2015-02-09 12:53:15 +01:00
Florian Nücke
7819544bde Fixed tablet disassembly. Closes #904. 2015-02-09 12:50:37 +01:00
Ben Blank
3b7fe503b4 add converters for World and WorldProvider objects 2015-02-08 11:44:56 -08:00
Ben Blank
5b09d44944 flatten converted values *after* recursive conversion, not instead of 2015-02-07 21:29:12 -08:00